From dd229df18cae147af8e3e5ee9a4a3654efc4bd80 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 07 3월 2022 17:09:00 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.28:9001/r/owl-kisa

---
 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 1b7aa7b..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">
+            <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