From 4d692a614bba9d8954cbbdad2d79424afaab0298 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 월, 03 1월 2022 17:50:00 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/issue/issueDetail.html | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index ecc2de2..390f5ef 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -101,7 +101,6 @@
</span>
</div>
</span>
-
<a class="show-ticket-info cursor">
<i class="os-icon os-icon-email-forward mr-20" ng-if="vm.viewer.modifyPermissionCheck" ng-click="fn.sendMailAll()" data-toggle="tooltip" data-placement="right" title="�떎瑜� �궗�슜�옄�뿉寃� �씠�뒋 蹂대궡湲�"></i>
<i class="os-icon os-icon-airplay mr-20" ng-click="fn.versionView(vm.viewer.id)" data-toggle="tooltip" data-placement="right" title="�씠�뒋 蹂�寃� �씠�젰 �긽�꽭 蹂닿린"></i>
@@ -110,7 +109,7 @@
<i class="os-icon os-icon-edit-1 mr-20" ng-click="fn.modify(vm.viewer.id)"
ng-if="vm.viewer.modifyPermissionCheck && vm.viewer.issueStatusVo.issueStatusType != 'CLOSE'" data-toggle="tooltip" data-placement="left" title="�씠�뒋 �닔�젙 �븯湲�"></i>
<!-- �긽�쐞 �씠�뒋媛� �엳�쓣�븣 �뮘濡쒓�湲� 踰꾪듉 �깮�꽦 -->
- <span ng-if="vm.viewer.parentIssueVo.id != null" class="issue-close mr-10" ng-click="fn.issueBack()"><i class="os-icon os-icon-skip-back" data-toggle="tooltip" data-placement="left" title="�씠�뒋 �뮘濡� �씠�룞"></i></span>
+ <span ng-if="vm.issueIds.length != 0 && vm.issueIds.length != 1" class="issue-close mr-10" ng-click="fn.issueBack()"><i class="os-icon os-icon-arrow-left7" data-toggle="tooltip" data-placement="left" title="�씠�뒋 �뮘濡� �씠�룞"></i></span>
<!-- �긽�쐞 �씠�뒋媛� �엳�쓣�븣 �긽�꽭�솕硫� �떕湲곕쾭�듉 �쐞移� 議곗젙 -->
<span class="issue-close" ng-click="fn.listView()"><i class="os-icon os-icon-close" data-toggle="tooltip" data-placement="left" title="�긽�꽭 �솕硫� �떕湲�"></i></span>
</a>
@@ -255,7 +254,7 @@
<!-- 硫��떚 ���젆�듃 -->
<div ng-switch-when="MULTI_SELECT">
<span class="issue-detail-word-break"
- ng-repeat="useValue in issueCustomField.useValues">{{::useValue.value}}, </span>
+ ng-repeat="useValue in issueCustomField.useValues">{{::useValue.value}}</span>
<span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
</div>
@@ -489,8 +488,21 @@
<div class="col-md-10">
<span class="info_detail_font h3" translate="issue.relationIssue">�뿰愿� �씠�뒋</span>
</div>
- <div class="col-md-1">
+ <!--<div class="col-md-1">
<button class="btn btn-darkgrey offset-10" ng-click="fn.addRelationIssueTableConfig()" type="button"><span translate="issue.settingTableDisplay">�뀒�씠釉� �몴�떆 �꽕�젙</span></button>
+ </div>-->
+ <div class="btn-group offset-11">
+ <button aria-expanded="false" aria-haspopup="true"
+ tabindex="-1"
+ class="btn btn-secondary dropdown-toggle"
+ data-toggle="dropdown" type="button"><span translate="common.addFunction">異붽�湲곕뒫</span>
+ </button>
+ <div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
+ x-placement="bottom-start" >
+ <!--<a class="dropdown-item cursor" form-submit="issueListForm" make-search-conditions="fn.makeSearchConditions()"> <span translate="common.allDownloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>-->
+ <a class="dropdown-item cursor" ng-click="fn.addRelationIssueTableConfig()"> <span translate="issue.settingTableDisplay">�뀒�씠釉� �몴�떆 �꽕�젙</span></a>
+ <a class="dropdown-item cursor" ng-click="fn.removeRelationIssue()"> <span translate="common.selectDelete">�궘�젣</span></a>
+ </div>
</div>
</div>
@@ -499,7 +511,7 @@
<js-table data="vm.viewer.issueRelationVos" table-configs="vm.relTableConfigs"
event="relTableEvent" detail-view="true" hide-header="false" use-sort="true"></js-table>
- <div class="row">
+ <div class="row" ng-if="vm.viewer.modifyPermissionCheck">
<div class="col-sm-4">
<select id="relationIssueType"
name="relationIssueType"
@@ -525,16 +537,13 @@
</div>
<div class="col-auto vertical-middle" style="display: flex">
<button type="button" class="btn btn-primary"
- ng-if="vm.viewer.modifyPermissionCheck"
ng-click="fn.addRelationIssue()"
translate="issue.addRelationIssue">�뿰愿� �씠�뒋 異붽�</button>
<button type="button" class="btn btn-sm btn-primary btn-roundRel offset-1"
- ng-if="vm.viewer.modifyPermissionCheck"
ng-click="fn.addRelationIssueForm(vm.viewer.id)">
<i class="os-icon os-icon-plus"><span></span></i>
</button>
</div>
-
</div>
</div>
@@ -542,7 +551,7 @@
<div class="col-md-8">
<span class="info_detail_font h3" translate="issue.downIssue">�븯�쐞 �씠�뒋</span>
</div>
- <div class="col-sm-2">
+ <!--<div class="col-sm-2">
<a><button type="button" class="btn btn-darkgrey offset-7" ng-if="vm.viewer.modifyPermissionCheck"
ng-click="fn.modifyDownIssueStatus()">
<span ng-if="vm.viewer.modifyPermissionCheck" translate="common.updateDownIssueAllStatus">�븯�쐞�씠�뒋 �긽�깭 �쟾泥� 蹂�寃�</span>
@@ -550,6 +559,20 @@
</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 class="btn-group offset-11">
+ <button aria-expanded="false" aria-haspopup="true"
+ tabindex="-1"
+ class="btn btn-secondary dropdown-toggle"
+ data-toggle="dropdown" type="button"><span translate="common.addFunction">異붽�湲곕뒫</span>
+ </button>
+ <div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
+ x-placement="bottom-start" >
+ <!--<a class="dropdown-item cursor" form-submit="issueListForm" make-search-conditions="fn.makeSearchConditions()"> <span translate="common.allDownloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>-->
+ <a class="dropdown-item cursor" ng-if="vm.viewer.modifyPermissionCheck" ng-click="fn.modifyDownIssueStatus()"> <span translate="common.updateDownIssueStatus">�븯�쐞�씠�뒋 �긽�깭 蹂�寃�</span></a>
+ <a class="dropdown-item cursor" ng-click="fn.addDownIssueTableConfig()"> <span translate="issue.settingTableDisplay">�뀒�씠釉� �몴�떆 �꽕�젙</span></a>
+ <a class="dropdown-item cursor" ng-click="fn.removeDownIssue()"> <span translate="common.selectDelete">�궘�젣</span></a>
+ </div>
</div>
</div>
@@ -558,8 +581,7 @@
<js-table data="vm.viewer.issueDownVos" table-configs="vm.downTableConfigs"
event="downTableEvent" detail-view="true" hide-header="false" use-sort="true"></js-table>
- <div class="row">
-
+ <div class="row" ng-if="vm.viewer.modifyPermissionCheck">
<div class="col-sm-6">
<js-autocomplete-single data-input-name="issue"
selected-model="vm.form.issuesDown"
@@ -574,16 +596,13 @@
</div>
<div class="col-auto vertical-middle" style="display: flex">
<button type="button" class="btn btn-primary"
- ng-if="vm.viewer.modifyPermissionCheck"
ng-click="fn.addDownIssue()"
translate="issue.addDownIssue">異붽�</button>
<button type="button" class="btn btn-sm btn-primary btn-roundRel offset-1"
- ng-if="vm.viewer.modifyPermissionCheck"
ng-click="fn.addDownIssueForm(vm.viewer.id)">
<i class="os-icon os-icon-plus"><span></span></i>
</button>
</div>
-
</div>
</div>
--
Gitblit v1.8.0