From 663ea2f2eca3b7da3bdaffb13eaac44433adb62f Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 목, 16 12월 2021 13:13:54 +0900
Subject: [PATCH] 기록탭 html 태그 보이는 내용 수정 / 사이드바 사용자 프로필 등급, 부서명 표시 수정
---
src/main/webapp/views/issue/issueDetail.html | 53 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index 27e2501..6a94a54 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -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>API : {{vm.viewer.isApi}}</span></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>
@@ -165,12 +166,12 @@
<div class="col-md-4">
<div class="form-group">
<label class="issue-detail-label"><span translate="common.importance">以묒슂�룄</span></label>
- <label class="issue-detail-label offset-detail-1"><span translate="common.priority">�슦�꽑 �닚�쐞</span></label>
- <label class="issue-detail-label offset-detail-2"><span translate="issue.issueStatus">�씠�뒋 �긽�깭</span></label>
+ <label class="issue-detail-label offset-detail-2"><span translate="common.priority">�슦�꽑 �닚�쐞</span></label>
+ <label class="issue-detail-label offset-detail-1"><span translate="issue.issueStatus">�씠�뒋 �긽�깭</span></label>
<div class="">
<span class="badge" ng-style="{'background-color' : vm.viewer.severityVo.color, 'border-color' : vm.viewer.severityVo.color, 'color' : '#FFFFFF' }" translate="{{vm.viewer.severityVo.name}}"></span>
- <span class="badge offset-1" ng-style="{'background-color' : vm.viewer.priorityVo.color, 'border-color' : vm.viewer.priorityVo.color, 'color' : '#FFFFFF' }" translate="{{vm.viewer.priorityVo.name}}"></span>
+ <span class="badge offset-detail-4" ng-style="{'background-color' : vm.viewer.priorityVo.color, 'border-color' : vm.viewer.priorityVo.color, 'color' : '#FFFFFF' }" translate="{{vm.viewer.priorityVo.name}}"></span>
<!-- 沅뚰븳�쓣 媛뽮퀬 �엳�쓣 �븣 -->
<span ng-if="vm.viewer.modifyPermissionCheck">
@@ -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>
@@ -466,7 +494,7 @@
<!-- �뿰愿� �씠�뒋 �뀒�씠釉� -->
<div class="mt-10 issue-detail-word-break width-100">
<js-table data="vm.viewer.issueRelationVos" table-configs="vm.relTableConfigs"
- event="relTableEvent" detail-view="true" hide-header="false" use-sort="false"></js-table>
+ event="relTableEvent" detail-view="true" hide-header="false" use-sort="true"></js-table>
<div class="row">
<div class="col-sm-4">
@@ -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">
@@ -523,7 +553,7 @@
<!-- �븯�쐞 �씠�뒋 �뀒�씠釉� -->
<div class="mt-10 issue-detail-word-break width-100">
<js-table data="vm.viewer.issueDownVos" table-configs="vm.downTableConfigs"
- event="downTableEvent" detail-view="true" hide-header="false" use-sort="false"></js-table>
+ event="downTableEvent" detail-view="true" hide-header="false" use-sort="true"></js-table>
<div class="row">
@@ -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>
@@ -726,9 +757,9 @@
translate="common.noRecord">
湲곕줉�씠 �뾾�뒿�땲�떎.
</div>
- <div>
+ <!--<div>
{{vm.viewer.issueHistoryVos}}
- </div>
+ </div>-->
<div class="activity-item"
ng-repeat="issueHistory in vm.viewer.issueHistoryVos">
--
Gitblit v1.8.0