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/issueAdd.html | 54 ++++++++++++++++++
src/main/webapp/views/issue/issueModify.html | 45 +++++++++++++++
src/main/webapp/views/issue/issueDetail.html | 64 +++++++++++++++------
3 files changed, 145 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html
index 5b8ad7a..a6b1a34 100644
--- a/src/main/webapp/views/issue/issueAdd.html
+++ b/src/main/webapp/views/issue/issueAdd.html
@@ -241,6 +241,60 @@
ng-required="issueCustomField.fieldOption == '01'">
</div>
+ <div ng-switch-when="NUMBER">
+ <input type="text" class="form-control input-sm"
+ ng-model="issueCustomField.useValues"
+ maxlength="100"
+ autocomplete="off"
+ kr-input
+ ng-required="issueCustomField.fieldOption == '01'">
+ </div>
+
+ <div ng-switch-when="DATETIME">
+ <input type="text" class="form-control input-sm"
+ ng-model="issueCustomField.useValues"
+ maxlength="100"
+ autocomplete="off"
+ kr-input
+ ng-required="issueCustomField.fieldOption == '01'">
+ </div>
+
+ <div ng-switch-when="IP_ADDRESS">
+ <input type="text" class="form-control input-sm"
+ ng-model="issueCustomField.useValues"
+ maxlength="100"
+ autocomplete="off"
+ kr-input
+ ng-required="issueCustomField.fieldOption == '01'">
+ </div>
+
+ <div ng-switch-when="EMAIL">
+ <input type="text" class="form-control input-sm"
+ ng-model="issueCustomField.useValues"
+ maxlength="100"
+ autocomplete="off"
+ kr-input
+ ng-required="issueCustomField.fieldOption == '01'">
+ </div>
+
+ <div ng-switch-when="SITE">
+ <input type="text" class="form-control input-sm"
+ ng-model="issueCustomField.useValues"
+ maxlength="100"
+ autocomplete="off"
+ kr-input
+ ng-required="issueCustomField.fieldOption == '01'">
+ </div>
+
+ <div ng-switch-when="TEL">
+ <input type="text" class="form-control input-sm"
+ ng-model="issueCustomField.useValues"
+ maxlength="100"
+ autocomplete="off"
+ kr-input
+ ng-required="issueCustomField.fieldOption == '01'">
+ </div>
+
<!-- �떒�씪 ���젆�듃 -->
<div ng-switch-when="SINGLE_SELECT">
<select class="form-control input-sm issue-select-label"
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index fb4cae4..cad525e 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -189,42 +189,70 @@
<div class="col-md-4">
<div class="form-group">
<h6 class="info_font" translate="common.detectingInfo">�깘吏��젙蹂�</h6>
- <span class="issue-detail-label" style="position: relative; top: 1rem" ng-show="vm.customFields == ''">�궗�슜�옄 �젙�쓽 �븘�뱶媛믪씠 �뾾�뒿�땲�떎.</span>
+ <span class="issue-detail-label" style="position: relative; top: 1rem" ng-show="vm.viewer.issueCustomFields == ''">�궗�슜�옄 �젙�쓽 �븘�뱶媛믪씠 �뾾�뒿�땲�떎.</span>
</div>
</div>
</div>
<!-- �궗�슜�옄 �젙�쓽 �븘�뱶 -->
<div class="row">
- <div class="col-md-2" ng-repeat="customField in vm.customFields">
- <h6 class="fc-red" ng-show="customField.customFieldType == 'INPUT'" translate="common.stringField">臾몄옄�뿴 �븘�뱶</h6>
- <h6 class="fc-red" ng-show="customField.customFieldType == 'SINGLE_SELECT'" translate="common.singleSelectionField">�떒�씪 �꽑�깮 �븘�뱶</h6>
- <h6 class="fc-red" ng-show="customField.customFieldType == 'MULTI_SELECT'" translate="common.multipleSelectionField">�떎以� �꽑�깮 �븘�뱶</h6>
- <h6 class="fc-red" ng-show="customField.customFieldType == 'NUMBER'" translate="common.numberField">�닽�옄 �꽑�깮 �븘�뱶</h6>
- <h6 class="fc-red" ng-show="customField.customFieldType == 'DATETIME'" translate="common.datetimeField">�궇吏� �꽑�깮 �븘�뱶</h6>
- <h6 class="fc-red" ng-show="customField.customFieldType == 'IP_ADDRESS'" translate="common.ipAddressField">IP Address �꽑�깮 �븘�뱶</h6>
- <h6 class="fc-red" ng-show="customField.customFieldType == 'EMAIL'" translate="common.emailField">�씠硫붿씪 �꽑�깮 �븘�뱶</h6>
- <h6 class="fc-red" ng-show="customField.customFieldType == 'SITE'" translate="common.siteField">URL �꽑�깮 �븘�뱶</h6>
- <h6 class="fc-red" ng-show="customField.customFieldType == 'TEL'" translate="common.telField">�쟾�솕踰덊샇 �꽑�깮 �븘�뱶</h6>
- <div class="issue-detail-label">{{::customField.name}}</div>
+ <div class="col-md-2" ng-repeat="issueCustomField in vm.viewer.issueCustomFields">
+ <label class="issue-detail-label">{{::issueCustomField.customFieldVo.name}}</label>
<div ng-switch on="issueCustomField.customFieldVo.customFieldType">
<!-- 湲곕낯 �엯�젰 -->
<div ng-switch-when="INPUT">
<!-- �씫湲� 紐⑤뱶 -->
- <span class="issue-detail-word-break">{{::customField.useValues}}</span>
- <span ng-if="!$root.isDefined(customField.useValues)">-</span>
+ <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
+ <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">{{::customField.useValues}}</span>
- <span ng-if="!$root.isDefined(customField.useValues)">-</span>
+ <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
</div>
<!-- 硫��떚 ���젆�듃 -->
<div ng-switch-when="MULTI_SELECT">
<span class="issue-detail-word-break"
- ng-repeat="useValue in customField.useValues">{{::useValue.value}}, </span>
- <span ng-if="!$root.isDefined(customField.useValues)">-</span>
+ ng-repeat="useValue in issueCustomField.useValues">{{::useValue.value}}, </span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
</div>
</div>
</div>
diff --git a/src/main/webapp/views/issue/issueModify.html b/src/main/webapp/views/issue/issueModify.html
index ed8998b..20938b6 100644
--- a/src/main/webapp/views/issue/issueModify.html
+++ b/src/main/webapp/views/issue/issueModify.html
@@ -241,6 +241,51 @@
ng-required="issueCustomField.fieldOption == '01'">
</div>
+ <div ng-switch-when="NUMBER">
+ <input type="text" class="form-control input-sm"
+ ng-model="issueCustomField.useValues"
+ maxlength="100"
+ autocomplete="off"
+ kr-input
+ ng-required="issueCustomField.fieldOption == '01'">
+ </div>
+
+ <div ng-switch-when="DATETIME">
+ <input type="text" class="form-control input-sm"
+ ng-model="issueCustomField.useValues"
+ maxlength="100"
+ autocomplete="off"
+ kr-input
+ ng-required="issueCustomField.fieldOption == '01'">
+ </div>
+
+ <div ng-switch-when="IP_ADDRESS">
+ <input type="text" class="form-control input-sm"
+ ng-model="issueCustomField.useValues"
+ maxlength="100"
+ autocomplete="off"
+ kr-input
+ ng-required="issueCustomField.fieldOption == '01'">
+ </div>
+
+ <div ng-switch-when="SITE">
+ <input type="text" class="form-control input-sm"
+ ng-model="issueCustomField.useValues"
+ maxlength="100"
+ autocomplete="off"
+ kr-input
+ ng-required="issueCustomField.fieldOption == '01'">
+ </div>
+
+ <div ng-switch-when="TEL">
+ <input type="text" class="form-control input-sm"
+ ng-model="issueCustomField.useValues"
+ maxlength="100"
+ autocomplete="off"
+ kr-input
+ ng-required="issueCustomField.fieldOption == '01'">
+ </div>
+
<!-- �떒�씪 ���젆�듃 -->
<div ng-switch-when="SINGLE_SELECT">
<select class="form-control input-sm issue-select-label"
--
Gitblit v1.8.0