From ab7e04765622b7ef31bb891a91e89abcf203c31d Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 목, 09 12월 2021 14:35:15 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/webapp/views/issue/issueDetail.html |   32 +++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index 40df672..27e2501 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -87,7 +87,7 @@
 <div class="support-ticket-content-w" ng-controller="issueDetailController">
     <div class="support-ticket-content">
         <span ng-if="vm.viewer.parentIssueVo != null" class="badge" ng-style="{'background-color' : '#353535', 'border-color' : vm.viewer.issueStatusVo.color, 'color' : '#FFFFFF' }">
-            <span>�긽�쐞 �씠�뒋:{{vm.viewer.parentIssueVo.title}}</span>
+            <span class="cursor" ng-click="fn.issueBack()">�긽�쐞 �씠�뒋:{{vm.viewer.parentIssueVo.title}}</span>
         </span>
 
         <div class="">
@@ -97,7 +97,7 @@
             <span class="ticket-header">
                 <div class="tasks-header-w">
                     <span class="tags">
-                        <span class="tag">{{vm.viewer.projectVo.projectKey}}-{{vm.viewer.issueNumber}} &nbsp; / &nbsp; {{vm.viewer.projectVo.name}}</span>
+                        <span class="tag">{{vm.viewer.projectVo.projectKey}}-{{vm.viewer.issueNumber}} &nbsp; / &nbsp; {{vm.viewer.projectVo.name}} &nbsp; / &nbsp; <span>API :&nbsp;{{vm.viewer.isApi}}</span></span>
                     </span>
                 </div>
             </span>
@@ -459,7 +459,7 @@
                         <span class="info_detail_font h3" translate="issue.relationIssue">�뿰愿� �씠�뒋</span>
                     </div>
                     <div class="col-md-1">
-                        <button class="btn btn-darkgrey offset-12" ng-click="fn.addRelationIssueTableConfig()" type="button"><span translate="issue.settingTableDisplay">�뀒�씠釉� �몴�떆 �꽕�젙</span></button>
+                        <button class="btn btn-darkgrey offset-10" ng-click="fn.addRelationIssueTableConfig()" type="button"><span translate="issue.settingTableDisplay">�뀒�씠釉� �몴�떆 �꽕�젙</span></button>
                     </div>
                 </div>
 
@@ -492,21 +492,31 @@
                                                     extra-settings="{ displayProp : 'title' , idProp : 'id', imageable : false, imagePathProp : '',
                                             type : '', maxlength : 200, autoResize : true, stopRemoveBodyEvent : true }"></js-autocomplete-single>
                         </div>
-                        <div class="col-auto vertical-middle">
-                            <button type="button" class="btn btn-primary form-control input-sm"
+                        <div class="col-auto vertical-middle" style="display: flex">
+                            <button type="button" class="btn btn-primary"
                                     ng-click="fn.addRelationIssue()"
                                     translate="issue.addRelationIssue">�뿰愿� �씠�뒋 異붽�</button>
+                            <button type="button" class="btn btn-sm btn-primary btn-roundRel  offset-1"
+                                    ng-click="fn.addRelationIssueForm(vm.viewer.id)">
+                                <i class="os-icon os-icon-plus"><span></span></i>
+                            </button>
                         </div>
 
                     </div>
                 </div>
 
                 <div class="row mt-30">
-                    <div class="col-md-10">
+                    <div class="col-md-8">
                         <span class="info_detail_font h3" translate="issue.downIssue">�븯�쐞 �씠�뒋</span>
                     </div>
-                    <div class="col-md-1">
-                        <button class="btn btn-darkgrey offset-12"  ng-click="fn.addDownIssueTableConfig()" type="button"><span translate="issue.settingTableDisplay">�뀒�씠釉� �몴�떆 �꽕�젙</span></button>
+                    <div class="col-sm-2">
+                        <a><button type="button" class="btn btn-darkgrey offset-7"
+                                ng-click="fn.modifyDownIssueStatus()">
+                                <span translate="common.updateDownIssueAllStatus">�븯�쐞�씠�뒋 �긽�깭 �쟾泥� 蹂�寃�</span>
+                        </button></a>
+                    </div>
+                    <div class="col-sm-1">
+                        <button class="btn btn-darkgrey offset-10"  ng-click="fn.addDownIssueTableConfig()" type="button"><span translate="issue.settingTableDisplay">�뀒�씠釉� �몴�떆 �꽕�젙</span></button>
                     </div>
                 </div>
 
@@ -521,7 +531,7 @@
                             <js-autocomplete-single data-input-name="issue"
                                                     selected-model="vm.form.issuesDown"
                                                     search="vm.issueNameDown"
-                                                    source="fn.getIssueList(vm.issueNameDown, vm.issueTypeId, vm.form.issuesDown, vm.autoCompletePageDown.issue.page, fn.getIssueListCallBack)"
+                                                    source="fn.getDownIssueList(vm.issueNameDown, vm.issueTypeId, vm.form.issuesDown, vm.autoCompletePageDown.issue.page, fn.getDownIssueListCallBack)"
                                                     page="vm.autoCompletePageDown.issue.page"
                                                     total-page="vm.autoCompletePageDown.issue.totalPage"
                                                     input-disabled="false"
@@ -529,8 +539,8 @@
                                                     extra-settings="{ displayProp : 'title' , idProp : 'id', imageable : false, imagePathProp : '',
                                             type : '', maxlength : 200, autoResize : true, stopRemoveBodyEvent : true }"></js-autocomplete-single>
                         </div>
-                        <div class="col-auto vertical-middle">
-                            <button type="button" class="btn btn-primary form-control input-sm"
+                        <div class="col-auto vertical-middle" style="display: flex">
+                            <button type="button" class="btn btn-primary"
                                     ng-click="fn.addDownIssue()"
                                     translate="issue.addDownIssue">異붽�</button>
                         </div>

--
Gitblit v1.8.0