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 | 60 ++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index e640537..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}} / {{vm.viewer.projectVo.name}}</span>
+ <span class="tag">{{vm.viewer.projectVo.projectKey}}-{{vm.viewer.issueNumber}} / {{vm.viewer.projectVo.name}} / <span>API : {{vm.viewer.isApi}}</span></span>
</span>
</div>
</span>
@@ -188,14 +188,9 @@
<div class="row">
<div class="col-md-4">
<div class="form-group">
- <h6 class="info_font" translate="common.detectingInfo">�깘吏��젙蹂�</h6>
+ <h6 class="info_detail_font" translate="common.detectingInfo">�깘吏��젙蹂�</h6>
<span class="issue-detail-label" style="position: relative; top: 1rem" ng-show="vm.viewer.issueCustomFields == ''">�궗�슜�옄 �젙�쓽 �븘�뱶媛믪씠 �뾾�뒿�땲�떎.</span>
</div>
- </div>
- <div class="col-md-2">
- <issue-detail-image-preview images="vm.images"></issue-detail-image-preview>
- </div>
- <div ng-show="vm.images.length < 1" class="detail-not-elements width-100">
</div>
</div>
<!-- �궗�슜�옄 �젙�쓽 �븘�뱶 -->
@@ -259,9 +254,16 @@
ng-repeat="useValue in issueCustomField.useValues">{{::useValue.value}}, </span>
<span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
</div>
- </div>
- </div>
+ </div>
+
+ </div>
+ <!--�씠誘몄� 誘몃━蹂닿린-->
+ <div class="col-md-2">
+ <issue-detail-image-preview images="vm.images"></issue-detail-image-preview>
+ </div>
+ <div ng-show="vm.images.length < 1" class="detail-not-elements width-100">
+ </div>
</div>
@@ -278,7 +280,7 @@
<div ng-show="fn.containsPartner('�뾽泥�')" class="row">
<div class="col-sm-2">
<div class="form-group">
- <h6 class="info_font" translate="companyField.info">�뾽泥댁젙蹂�</h6>
+ <h6 class="info_detail_font" translate="companyField.info">�뾽泥댁젙蹂�</h6>
</div>
</div>
</div>
@@ -332,7 +334,7 @@
<div ng-show="fn.containsPartner('ISP');" class="row">
<div class="col-sm-2">
<div class="form-group">
- <h6 class="info_font" translate="ispField.info">ISP�젙蹂�</h6>
+ <h6 class="info_detail_font" translate="ispField.info">ISP�젙蹂�</h6>
</div>
</div>
</div>
@@ -393,7 +395,7 @@
<div ng-show="fn.containsPartner('�샇�뒪�똿');" class="row">
<div class="col-sm-2">
<div class="form-group">
- <h6 class="info_font" translate="hostingField.info">�샇�뒪�똿�젙蹂�</h6>
+ <h6 class="info_detail_font" translate="hostingField.info">�샇�뒪�똿�젙蹂�</h6>
</div>
</div>
</div>
@@ -454,10 +456,10 @@
<div class="row mt-30">
<div class="col-md-10">
- <span class="info_font h3" translate="issue.relationIssue">�뿰愿� �씠�뒋</span>
+ <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>
@@ -490,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">
- <span class="info_font h3" translate="issue.downIssue">�븯�쐞 �씠�뒋</span>
+ <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>
@@ -519,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"
@@ -527,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