From ec9c7e5582d4c20c35e7c3016d64a2213e9f6a50 Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 화, 15 3월 2022 12:12:17 +0900
Subject: [PATCH] - 파트너 엑셀 임포트 시 이메일 정규식표현 검사하는 코드 제거 - 이슈 상세페이지 setHideCompleteIssue null 체크 - api로 이슈 추가 시 이슈유형에 업체가 설정되어있지 않는경우 메시지 추가

---
 src/main/webapp/custom_components/js-workflow/js-workflow.html |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/custom_components/js-workflow/js-workflow.html b/src/main/webapp/custom_components/js-workflow/js-workflow.html
index e855de5..691b1e1 100644
--- a/src/main/webapp/custom_components/js-workflow/js-workflow.html
+++ b/src/main/webapp/custom_components/js-workflow/js-workflow.html
@@ -12,7 +12,7 @@
                         <option ng-repeat="issueStatus in vm.issueStatuses"
                                 value="{{issueStatus.id}}"
                                 ng-style="{ 'color' : issueStatus.color, 'font-weight': 600 }">
-                            �뿈&nbsp; {{issueStatus.name}}
+                            �뿈&nbsp; {{issueStatus.name}} ({{issueStatus.issueStatusTypeKr}})
                         </option>
                     </select>
                     <div class="input-group-prepend">
@@ -33,7 +33,7 @@
                         <option ng-repeat="issueStatus in fn.getAvailableStartStatus()"
                                 ng-style="{ 'color' : issueStatus.color, 'font-weight': 600 }"
                                 value="{{issueStatus.id}}">
-                            �뿈&nbsp;{{issueStatus.name}}
+                            �뿈&nbsp;{{issueStatus.name}} ({{issueStatus.issueStatusTypeKr}})
                         </option>
                     </select>
                 </div>
@@ -50,7 +50,7 @@
                         <option value="{{issueStatus.id}}"
                                 ng-style="{ 'color' : issueStatus.color, 'font-weight': 600 }"
                                 ng-repeat="issueStatus in vm.targetIssueStatusList">
-                            �뿈&nbsp;{{issueStatus.name}}
+                            �뿈&nbsp;{{issueStatus.name}} ({{issueStatus.issueStatusTypeKr}})
                         </option>
                     </select>
                     <div class="input-group-prepend">
@@ -60,7 +60,7 @@
                 </div>
             </div>
 
-            <div class="form-group" ng-if="vm.activeTarget != null" ng-hide="vm.activeTarget.colorClass != null">
+            <div class="form-group" ng-if="vm.activeTarget != null" ng-show="vm.activeTarget.type === '01'">
                 <label><span translate="project.projectDepartment">遺��꽌紐�</span><span>[{{vm.activeTarget.name}}]</span></label>
                 <js-autocomplete-multi data-input-name="departments"
                                        selected-model="vm.departments"

--
Gitblit v1.8.0