From a93ef198d8ac95975560d71e53aa1aa59d8c5125 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 30 11월 2021 15:53:24 +0900
Subject: [PATCH] 사용자 정의 필드 관련 오류 수정
---
src/main/webapp/views/issue/issueDetail.html | 66 +++++++++++++++++---------------
1 files changed, 35 insertions(+), 31 deletions(-)
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index 5b82040..fb4cae4 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -189,35 +189,50 @@
<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>
</div>
</div>
</div>
<!-- �궗�슜�옄 �젙�쓽 �븘�뱶 -->
<div class="row">
- <div class="col-md-2" ng-repeat="issueCustomField in vm.viewer.issueCustomFields">
- <label class="issue-detail-label">{{::issueCustomField.customFieldVo.name}}</label>
-
+ <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 ng-switch on="issueCustomField.customFieldVo.customFieldType">
<!-- 湲곕낯 �엯�젰 -->
<div ng-switch-when="INPUT">
<!-- �씫湲� 紐⑤뱶 -->
- <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
- <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
+ <span class="issue-detail-word-break">{{::customField.useValues}}</span>
+ <span ng-if="!$root.isDefined(customField.useValues)">-</span>
</div>
<!-- �떒�씪 ���젆�듃 -->
<div ng-switch-when="SINGLE_SELECT">
- <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>
- <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
+ <span class="issue-detail-word-break">{{::customField.useValues}}</span>
+ <span ng-if="!$root.isDefined(customField.useValues)">-</span>
</div>
<!-- 硫��떚 ���젆�듃 -->
<div ng-switch-when="MULTI_SELECT">
<span class="issue-detail-word-break"
- ng-repeat="useValue in issueCustomField.useValues">{{::useValue.value}}, </span>
- <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
+ ng-repeat="useValue in customField.useValues">{{::useValue.value}}, </span>
+ <span ng-if="!$root.isDefined(customField.useValues)">-</span>
</div>
</div>
+ </div>
+ <div class="pdt0" style="position: relative; bottom: 1rem">
+ <issue-detail-image-preview images="vm.images"></issue-detail-image-preview>
+ </div>
+ <div ng-show="vm.images.length < 1" class="detail-not-elements width-100">
+ <span></span>
</div>
</div>
@@ -230,7 +245,8 @@
</div>-->
<hr>
<!-- <span class="tag">{{vm.viewer.projectVo.projectKey}}-{{vm.viewer.issueNumber}} / {{vm.viewer.projectVo.name}}</span>-->
- <div 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>
@@ -238,7 +254,7 @@
</div>
</div>
- <div class="row">
+ <div ng-show="fn.containsPartner('�뾽泥�')" class="row">
<div class="col-sm-2">
<div class="form-group">
<span translate="companyField.companyName">�뾽泥대챸</span>:
@@ -283,7 +299,7 @@
</div>
</div>
- <div 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>
@@ -291,7 +307,7 @@
</div>
</div>
- <div 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>:
@@ -343,7 +359,7 @@
</div>
</div>
- <div 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>
@@ -351,7 +367,8 @@
</div>
</div>
- <div class="row">
+ <div ng-show="fn.containsPartner('�샇�뒪�똿');" class="row">
+
<div class="col-sm-2">
<div class="form-group">
<span translate="hostingField.hostingName">�샇�뒪�똿紐�</span>:
@@ -435,7 +452,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"
@@ -467,11 +484,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"
@@ -534,20 +552,6 @@
<div ng-show="vm.viewer.attachedFileVos.length < 1" class="detail-not-elements">
<span translate="common.noAttachedFile">泥⑤��맂 �뙆�씪�씠 �뾾�뒿�땲�떎.</span>
</div>
- </div>
-
- <div class="row">
- <div class="col-sm-12">
- <h6 class="todo-content-subheader mt-20"><span translate="issue.previewImage">�씠誘몄� 誘몃━ 蹂닿린</span>
- </h6>
- <div class="pdt10">
- <issue-detail-image-preview images="vm.images"></issue-detail-image-preview>
- </div>
- </div>
- <div ng-show="vm.images.length < 1" class="detail-not-elements width-100">
- <span translate="common.noImage">泥⑤��맂 �씠誘몄�媛� �뾾�뒿�땲�떎.</span>
- </div>
-
</div>
<!-- �솢�룞 �궡�뿭 -->
--
Gitblit v1.8.0