From b070c969c3aef01166d59d7f8aa0159f5facb0f9 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 30 11월 2021 16:12:56 +0900
Subject: [PATCH] 사용자 정의 필드 관련 수정
---
src/main/webapp/views/issue/issueDetail.html | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index 532e0ec..cad525e 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -205,6 +205,43 @@
<span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
</div>
+ <div ng-switch-when="NUMBER">
+ <!-- �씫湲� 紐⑤뱶 -->
+ <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
+ </div>
+
+ <div ng-switch-when="DATETIME">
+ <!-- �씫湲� 紐⑤뱶 -->
+ <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
+ </div>
+
+ <div ng-switch-when="IP_ADDRESS">
+ <!-- �씫湲� 紐⑤뱶 -->
+ <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
+ </div>
+
+ <div ng-switch-when="EMAIL">
+ <!-- �씫湲� 紐⑤뱶 -->
+ <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
+ </div>
+
+ <div ng-switch-when="SITE">
+ <!-- �씫湲� 紐⑤뱶 -->
+ <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
+ </div>
+
+ <div ng-switch-when="TEL">
+ <!-- �씫湲� 紐⑤뱶 -->
+ <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
+ </div>
+
+
<!-- �떒�씪 ���젆�듃 -->
<div ng-switch-when="SINGLE_SELECT">
<span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
@@ -237,7 +274,7 @@
<hr>
<!-- <span class="tag">{{vm.viewer.projectVo.projectKey}}-{{vm.viewer.issueNumber}} / {{vm.viewer.projectVo.name}}</span>-->
- <div ng-show="vm.viewer.useCompanyVo[0].name == '�뾽泥�'" class="row">
+ <div ng-show="fn.containsPartner('�뾽泥�')" class="row">
<div class="col-sm-2">
<div class="form-group">
<h6 class="info_font" translate="companyField.info">�뾽泥댁젙蹂�</h6>
@@ -245,7 +282,7 @@
</div>
</div>
- <div ng-show="vm.viewer.useCompanyVo[0].name == '�뾽泥�'" class="row">
+ <div ng-show="fn.containsPartner('�뾽泥�')" class="row">
<div class="col-sm-2">
<div class="form-group">
<span translate="companyField.companyName">�뾽泥대챸</span>:
@@ -290,7 +327,7 @@
</div>
</div>
- <div ng-show="vm.viewer.useCompanyVo[0].name == 'ISP' || vm.viewer.useCompanyVo[1].name == 'ISP'" class="row">
+ <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>
@@ -298,7 +335,7 @@
</div>
</div>
- <div ng-show="vm.viewer.useCompanyVo[0].name == 'ISP' || vm.viewer.useCompanyVo[1].name == 'ISP'" class="row">
+ <div ng-show="fn.containsPartner('ISP');" class="row">
<div class="col-sm-2">
<div class="form-group">
<span translate="ispField.ispName">ISP紐�</span>:
@@ -350,7 +387,7 @@
</div>
</div>
- <div ng-show="vm.viewer.useCompanyVo[0].name == '�샇�뒪�똿' || vm.viewer.useCompanyVo[1].name == '�샇�뒪�똿' || vm.viewer.useCompanyVo[2].name == '�샇�뒪�똿'" class="row">
+ <div ng-show="fn.containsPartner('�샇�뒪�똿');" class="row">
<div class="col-sm-2">
<div class="form-group">
<h6 class="info_font" translate="hostingField.info">�샇�뒪�똿�젙蹂�</h6>
@@ -358,7 +395,7 @@
</div>
</div>
- <div ng-show="vm.viewer.useCompanyVo[0].name == '�샇�뒪�똿' || vm.viewer.useCompanyVo[1].name == '�샇�뒪�똿' || vm.viewer.useCompanyVo[2].name == '�샇�뒪�똿'" class="row">
+ <div ng-show="fn.containsPartner('�샇�뒪�똿');" class="row">
<div class="col-sm-2">
<div class="form-group">
@@ -443,7 +480,7 @@
<js-autocomplete-single data-input-name="issue"
selected-model="vm.form.issues"
search="vm.issueName"
- source="fn.getIssueList(vm.issueName, vm.form.issues, vm.autoCompletePage.issue.page, fn.getIssueListCallBack)"
+ source="fn.getIssueList(vm.issueName, vm.issueTypeId, vm.form.issues, vm.autoCompletePage.issue.page, fn.getIssueListCallBack)"
page="vm.autoCompletePage.issue.page"
total-page="vm.autoCompletePage.issue.totalPage"
input-disabled="false"
@@ -475,11 +512,12 @@
event="downTableEvent" detail-view="true" hide-header="false" use-sort="false"></js-table>
<div class="row">
+
<div class="col-sm-6">
<js-autocomplete-single data-input-name="issue"
selected-model="vm.form.issuesDown"
search="vm.issueNameDown"
- source="fn.getIssueList(vm.issueNameDown, vm.form.issuesDown, vm.autoCompletePageDown.issue.page, fn.getIssueListCallBack)"
+ source="fn.getIssueList(vm.issueNameDown, vm.issueTypeId, vm.form.issuesDown, vm.autoCompletePageDown.issue.page, fn.getIssueListCallBack)"
page="vm.autoCompletePageDown.issue.page"
total-page="vm.autoCompletePageDown.issue.totalPage"
input-disabled="false"
--
Gitblit v1.8.0