From ee356fead3840ad1e34bee7a15d72fdbc435ecb0 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 08 12월 2021 17:20:13 +0900
Subject: [PATCH] - api 하위 이슈 설정메뉴 수정 - 이슈 유형마다 자동 종료 설정할수있도록 수정 - 기타 오류 수정

---
 src/main/webapp/views/api/apiSettingOverlap.html |   45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 44 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/views/api/apiSettingOverlap.html b/src/main/webapp/views/api/apiSettingOverlap.html
index 6d0cc83..6d83e51 100644
--- a/src/main/webapp/views/api/apiSettingOverlap.html
+++ b/src/main/webapp/views/api/apiSettingOverlap.html
@@ -47,6 +47,48 @@
 
 </div>
 
+<label for="issueTypeForm" class="issue-label">
+    <span translate="api.upIssueCompleteIssueStatus">�긽�쐞 �씠�뒋 �옄�룞醫낅즺 �씠�뒋 �긽�깭 �꽕�젙</span>
+</label>
+<div class="element-box">
+    <div class="row">
+        <!-- �씠�뒋 �긽�깭 -->
+        <div class="form-group mb10">
+            <label for="issueStatusForm" class="issue-label">
+                <span translate="api.autoCompleteIssueStatus">�씠�뒋 �긽�깭</span>
+            </label>
+            <select id="issueStatusForm"
+                    name="issueStatus"
+                    class="form-control input-sm issue-select-label"
+                    ng-style="{ 'color' : fn.getOptionColor(vm.completeIssueStatuses, vm.completeIssueStatusId) }"
+                    ng-model="vm.completeIssueStatusId"
+                    ng-change="fn.onChangeIssueTypeSpec()"
+                    required>
+                <option ng-repeat="issueStatus in vm.completeIssueStatuses"
+                        ng-style="{ 'color' : issueStatus.color, 'font-weight': 600 }"
+                        value="{{issueStatus.id}}"
+                        translate="{{issueStatus.name}}(id:{{issueStatus.id}})">
+                </option>
+            </select>
+        </div>
+    </div>
+    <div class="row modal-footer buttons-on-right">
+        <div class="">
+            <button type="button" class="btn btn-md btn-secondary bold"
+                    ng-click="fn.resetCompleteIssueStatus()"><span translate="common.reset">珥덇린�솕</span>
+            </button>
+            <button type="button" class="btn btn-md btn-primary bold"
+                    js-short-cut
+                    js-short-cut-action="(fn.formCheck(issueStatusForm.$invalid) || $root.spinner) ? null : fn.formSubmitCompleteIssueStatus()"
+                    ng-click="fn.formSubmitCompleteIssueStatus()"><span translate="common.saved">�깮�꽦</span>
+            </button>
+        </div>
+    </div>
+</div>
+
+<label for="issueTypeForm" class="issue-label">
+    <span translate="api.downIssueOverlapSetting">�븯�쐞 �씠�뒋 泥섎━ 湲곗� �빆紐�</span>
+</label>
 <div class="element-box" style="height: 600px">
     <form role="form" name="apiSettingOverlapForm">
         <div class="form-group">
@@ -54,7 +96,7 @@
             <js-autocomplete-multi data-input-name="customField"
                                    selected-model="vm.form.customFields"
                                    search="vm.customFieldName"
-                                   source="fn.getCustomFieldList(vm.customFieldName, vm.form.customFields)"
+                                   source="fn.getIssueTypeCustomFieldList(vm.customFieldName, vm.form.customFields, vm.projectId, vm.issueTypeId)"
                                    input-disabled="false"
                                    translation-texts="{ count : 'common.few', empty : 'common.emptyCustomField' }"
                                    required
@@ -80,3 +122,4 @@
       </div>
     </form>
 </div>
+

--
Gitblit v1.8.0