From 446558ce46f9cf4d6d6e9d64f5bbf89b4ff86550 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 24 1월 2022 17:54:43 +0900
Subject: [PATCH] - 이슈 excel import 오류 수정 및 유효성 검사 추가 - 이슈 excel import시 프로젝트에 속한 이슈유형 리스트만 보여주도록 수정
---
src/main/webapp/views/issue/issueDetail.html | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index 00d275b..404e999 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 class="cursor" ng-click="fn.issueBack()">�긽�쐞 �씠�뒋:{{vm.viewer.parentIssueVo.title}}</span>
+ <span class="cursor" ng-click="fn.goParentIssue()">�긽�쐞 �씠�뒋:{{vm.viewer.parentIssueVo.title}}</span>
</span>
<div class="">
@@ -108,7 +108,7 @@
<!-- <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>-->
<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>
+ ng-if="vm.viewer.modifyPermissionCheck" data-toggle="tooltip" data-placement="left" title="�씠�뒋 �닔�젙 �븯湲�"></i>
<!-- �긽�쐞 �씠�뒋媛� �엳�쓣�븣 �뮘濡쒓�湲� 踰꾪듉 �깮�꽦 -->
<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>
<!-- �긽�쐞 �씠�뒋媛� �엳�쓣�븣 �긽�꽭�솕硫� �떕湲곕쾭�듉 �쐞移� 議곗젙 -->
@@ -315,11 +315,20 @@
</div>
</div>
- <div class="col-sm-2">
+ <div class="col-sm-2" ng-if="vm.viewer.modifyPermissionCheck">
<div class="form-group">
<div class="">
<span translate="companyField.email">�씠硫붿씪</span>:
<span class="email_color cursor" ng-click="fn.sendMailVo(vm.viewer.issueCompanyVos)">{{vm.viewer.issueCompanyVos[0].email}}</span>
+ </div>
+ </div>
+ </div>
+
+ <div class="col-sm-2" ng-if="!vm.viewer.modifyPermissionCheck">
+ <div class="form-group">
+ <div class="">
+ <span translate="companyField.email">�씠硫붿씪</span>:
+ <span>{{vm.viewer.issueCompanyVos[0].email}}</span>
</div>
</div>
</div>
@@ -430,11 +439,20 @@
</div>
</div>
- <div class="col-sm-2">
+ <div class="col-sm-2" ng-if="vm.viewer.modifyPermissionCheck">
<div class="form-group">
<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" ng-if="!vm.viewer.modifyPermissionCheck">
+ <div class="form-group">
+ <div class="">
+ <span translate="ispField.email">�씠硫붿씪</span>:
+ <span>{{vm.viewer.issueIspVos[0].email}}</span>
</div>
</div>
</div>
@@ -501,7 +519,7 @@
</div>
</div>
- <div class="col-sm-2">
+ <div class="col-sm-2" ng-if="vm.viewer.modifyPermissionCheck">
<div class="form-group">
<div class="">
<span translate="hostingField.email">�씠硫붿씪</span>:
@@ -510,6 +528,15 @@
</div>
</div>
+ <div class="col-sm-2" ng-if="!vm.viewer.modifyPermissionCheck">
+ <div class="form-group">
+ <div class="">
+ <span translate="hostingField.email">�씠硫붿씪</span>:
+ <span>{{vm.viewer.issueHostingVos[0].email}}</span>
+ </div>
+ </div>
+ </div>
+
<div class="col-sm-2">
<div class="form-group">
<div class="">
--
Gitblit v1.8.0