From d8a2bc3c8fe4cb8656abbf90fdc22e3ace1a82f3 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 15 12월 2021 15:27:25 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/issue/issueDetail.html | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index 538bf7a..811a577 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,13 +97,13 @@
<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 ng-if="vm.viewer.isApi == 'Y'">/</span> <span ng-if="vm.viewer.isApi == 'Y'" class="badge" ng-style="{'background-color' : '#EF8D9A', 'border-color' : '#EF8D9A', 'color' : '#FFFFFF' }">API</span></span>
</span>
</div>
</span>
<a class="show-ticket-info cursor">
- <i class="os-icon os-icon-email-forward mr-20" ng-click="fn.sendMailAll()" data-toggle="tooltip" data-placement="right" title="�떎瑜� �궗�슜�옄�뿉寃� �씠�뒋 蹂대궡湲�"></i>
+ <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>
<i class="os-icon os-icon-calendar-time mr-20" ng-if="vm.viewer.modifyPermissionCheck"
ng-click="fn.reservation(vm.viewer.id)" data-toggle="tooltip" data-placement="right" title="�씠�뒋 諛쒖깮 �삁�빟 �븯湲�"></i>
@@ -139,6 +139,7 @@
<span ng-if="vm.viewer.departmentVos.length < 1" translate="common.noDepartment">�떞�떦遺��꽌媛� �뾾�뒿�땲�떎.</span>
<i class="fa fa-edit fa-2x issue-status-edit cursor"
+ ng-if="vm.viewer.modifyPermissionCheck"
ng-click="fn.modifyIssueDepartment()" data-toggle="tooltip" data-placement="right" title="�떞�떦�옄 蹂�寃� �븯湲�"></i>
</div>
</div>
@@ -323,6 +324,15 @@
<div class="col-sm-2">
<div class="form-group">
<div class="">
+ <span translate="companyField.url">url</span>:
+ <span>{{vm.viewer.issueCompanyVos[0].url}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
<span translate="companyField.memo">鍮꾧퀬</span>:
<span>{{vm.viewer.issueCompanyVos[0].memo}}</span>
</div>
@@ -377,6 +387,15 @@
<div class="">
<span translate="ispField.email">�씠硫붿씪</span>:
<span class="email_color cursor" ng-click="fn.sendMailVo(vm.viewer.issueIspVos)">{{vm.viewer.issueIspVos[0].email}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
+ <span translate="companyField.url">url</span>:
+ <span>{{vm.viewer.issueIspVos[0].url}}</span>
</div>
</div>
</div>
@@ -446,6 +465,15 @@
<div class="col-sm-2">
<div class="form-group">
<div class="">
+ <span translate="companyField.url">url</span>:
+ <span>{{vm.viewer.issueHostingVos[0].url}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2">
+ <div class="form-group">
+ <div class="">
<span translate="hostingField.memo">鍮꾧퀬</span>:
<span>{{vm.viewer.issueHostingVos[0].memo}}</span>
</div>
@@ -494,9 +522,11 @@
</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>
@@ -510,9 +540,9 @@
<span class="info_detail_font h3" translate="issue.downIssue">�븯�쐞 �씠�뒋</span>
</div>
<div class="col-sm-2">
- <a><button type="button" class="btn btn-darkgrey offset-7"
+ <a><button type="button" class="btn btn-darkgrey offset-7" ng-if="vm.viewer.modifyPermissionCheck"
ng-click="fn.modifyDownIssueStatus()">
- <span translate="common.updateDownIssueAllStatus">�븯�쐞�씠�뒋 �긽�깭 �쟾泥� 蹂�寃�</span>
+ <span ng-if="vm.viewer.modifyPermissionCheck" translate="common.updateDownIssueAllStatus">�븯�쐞�씠�뒋 �긽�깭 �쟾泥� 蹂�寃�</span>
</button></a>
</div>
<div class="col-sm-1">
@@ -541,6 +571,7 @@
</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>
</div>
--
Gitblit v1.8.0