From 5fb1952ae91f1a739803247266e87dbd15ea1f27 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 01 12월 2021 13:23:09 +0900
Subject: [PATCH] 충돌 수정
---
src/main/webapp/views/issue/issueDetail.html | 159 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 96 insertions(+), 63 deletions(-)
diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html
index 5385b12..765c919 100644
--- a/src/main/webapp/views/issue/issueDetail.html
+++ b/src/main/webapp/views/issue/issueDetail.html
@@ -189,21 +189,93 @@
<div class="col-md-4">
<div class="form-group">
<h6 class="info_font" translate="common.detectingInfo">�깘吏��젙蹂�</h6>
- <div class="">
- <label class="issue-detail-label"><span translate="common.diffuserURL">�쑀�룷�옄URL</span> </label>
- <label class="issue-detail-label offset-2"><span translate="common.country">援�媛�</span></label>
- <div class="">
- <span>200.11.13.123</span>
- <span class="country">US</span>
- </div>
-<!-- <span ng-if="vm.viewer.userVos.length < 1" translate="common.noAssignee">�떞�떦�옄媛� �뾾�뒿�땲�떎.</span>-->
+ <span class="issue-detail-label" style="position: relative; top: 1rem" ng-show="vm.viewer.issueCustomFields == ''">�궗�슜�옄 �젙�쓽 �븘�뱶媛믪씠 �뾾�뒿�땲�떎.</span>
+ </div>
+ </div>
+ <div class="col-md-2">
+ <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">
+ </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 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>
+ </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>
+ <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 issueCustomField.useValues">{{::useValue.value}}, </span>
+ <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>
</div>
</div>
</div>
+
</div>
+
+
+ <!-- <div class="">
+ <label class="issue-detail-label"><span>{{vm.viewer.issueCustomFieldValueVos[0].useValue}}</span> </label>
+ <div class="">
+ <span>{{vm.viewer.issueCustomFieldValueVos[0].customFieldVo.name}}</span>
+ </div>
+ <span ng-if="vm.viewer.userVos.length < 1" translate="common.noAssignee">�떞�떦�옄媛� �뾾�뒿�땲�떎.</span>
+ </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>
@@ -211,7 +283,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>:
@@ -241,7 +313,7 @@
<div class="form-group">
<div class="">
<span translate="companyField.email">�씠硫붿씪</span>:
- <span class="email_color">{{vm.viewer.issueCompanyVos[0].email}}</span>
+ <span class="email_color cursor" ng-click="fn.sendMail(vm.viewer.id, vm.viewer.projectVo.id)">{{vm.viewer.issueCompanyVos[0].email}}</span>
</div>
</div>
</div>
@@ -256,7 +328,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>
@@ -264,7 +336,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>:
@@ -301,7 +373,7 @@
<div class="form-group">
<div class="">
<span translate="ispField.email">�씠硫붿씪</span>:
- <span class="email_color">{{vm.viewer.issueIspVos[0].email}}</span>
+ <span class="email_color cursor" ng-click="fn.sendMail(vm.viewer.id, vm.viewer.projectVo.id)">{{vm.viewer.issueIspVos[0].email}}</span>
</div>
</div>
</div>
@@ -316,7 +388,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>
@@ -324,7 +396,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>:
@@ -361,7 +434,7 @@
<div class="form-group">
<div class="">
<span translate="hostingField.email">�씠硫붿씪</span>:
- <span class="email_color">{{vm.viewer.issueHostingVos[0].email}}</span>
+ <span class="email_color cursor" ng-click="fn.sendMail(vm.viewer.id, vm.viewer.projectVo.id)">{{vm.viewer.issueHostingVos[0].email}}</span>
</div>
</div>
</div>
@@ -376,34 +449,7 @@
</div>
</div>
- <!-- �궗�슜�옄 �젙�쓽 �븘�뱶 -->
-<!-- <div class="row">-->
-<!-- <div class="col-md-4" 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" class="form-group">-->
-<!-- <!– �씫湲� 紐⑤뱶 –>-->
-<!-- <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>-->
-<!-- <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>-->
-<!-- </div>-->
-
-<!-- <!– �떒�씪 ���젆�듃 –>-->
-<!-- <div ng-switch-when="SINGLE_SELECT" class="form-group">-->
-<!-- <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span>-->
-<!-- <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>-->
-<!-- </div>-->
-
-<!-- <!– 硫��떚 ���젆�듃 –>-->
-<!-- <div ng-switch-when="MULTI_SELECT" class="form-group">-->
-<!-- <span class="issue-detail-word-break"-->
-<!-- ng-repeat="useValue in issueCustomField.useValues">{{::useValue.value}}, </span>-->
-<!-- <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </div>-->
<div class="row mt-30">
<div class="col-md-10">
@@ -414,7 +460,7 @@
</div>
</div>
- <!-- �뀒�씠釉� -->
+ <!-- �뿰愿� �씠�뒋 �뀒�씠釉� -->
<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>
@@ -435,7 +481,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"
@@ -446,7 +492,7 @@
<div class="col-auto vertical-middle">
<button type="button" class="btn btn-primary form-control input-sm"
ng-click="fn.addRelationIssue()"
- translate="issue.addRelationIssue">異붽�</button>
+ translate="issue.addRelationIssue">�뿰愿� �씠�뒋 異붽�</button>
</div>
</div>
@@ -461,17 +507,18 @@
</div>
</div>
- <!-- �뀒�씠釉� -->
+ <!-- �븯�쐞 �씠�뒋 �뀒�씠釉� -->
<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>
<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 +581,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