From af59a06e2926aa954d949ea0a306c34c6a517782 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 일, 05 12월 2021 11:50:34 +0900
Subject: [PATCH] 이메일 템플릿 형식 변경
---
src/main/webapp/views/issue/issueAdd.html | 78 ++++++++++++++++++++++++++++++++-------
1 files changed, 64 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html
index 1fcfcd2..6da99cd 100644
--- a/src/main/webapp/views/issue/issueAdd.html
+++ b/src/main/webapp/views/issue/issueAdd.html
@@ -1,7 +1,7 @@
<div class="formModal">
<div class="modal-header faded smaller">
<div class="modal-title">
- <strong translate="issue.createIssue">�씠�뒋 留뚮뱾湲�</strong>
+ <strong translate="issue.createIssue">�씠�뒋 �닔�젙</strong>
</div>
<button aria-label="Close" class="close" type="button" ng-click="fn.cancel()">
<span aria-hidden="true"> ×</span>
@@ -39,7 +39,7 @@
source="fn.getProjectList(vm.projectName, vm.form.projects, vm.autoCompletePage.project.page, fn.getProjectListCallBack)"
page="vm.autoCompletePage.project.page"
total-page="vm.autoCompletePage.project.totalPage"
- input-disabled="false"
+ input-disabled="vm.form.projects != null ? vm.form.projects.length > 0 : false"
translation-texts="{ empty : 'common.emptyProject' }"
extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
@@ -59,7 +59,8 @@
ng-model="vm.form.issueTypeId"
ng-change="fn.getIssueTypeCustomFields()"
ng-style="{ 'color' : fn.getOptionColor(vm.issueTypes, vm.form.issueTypeId) }"
- required>
+ required
+ disabled>
<option value="" translate="common.selectTarget" ng-style="{ 'color' : '#353535' }"><span
translate="common.selectTarget">���긽 �꽑�깮</span>
</option>
@@ -123,12 +124,12 @@
<div class="col-lg-4">
<div class="form-group mb10">
<label class="issue-label"> <span translate="common.assigneeTeam">�떞�떦遺��꽌</span> </label>
- <js-autocomplete-multi data-input-name="department"
+ <js-autocomplete-multi data-input-name="departments"
selected-model="vm.form.departments"
search="vm.departmentName"
source="fn.getIssueDepartmentList(vm.departmentName, vm.form.departments)"
input-disabled="false"
- translation-texts="{ count : 'common.userNum', empty : 'common.emptyDepartment'}"
+ translation-texts="{ count : 'common.userNum', empty : 'common.emptyProjectDepartment'}"
extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true}"></js-autocomplete-multi>
<div class="select3-selection__choicediv mt-10">
@@ -217,7 +218,7 @@
</div>
</div>
- <div class="col-lg-8">
+ <div class="col-lg-12">
<div class="row">
<div class="col-md-12">
<div class="form-group mgb5" ng-show="vm.form.issueCustomFields.length < 1">
@@ -226,13 +227,58 @@
</div>
</div>
- <div class="col-md-6" ng-repeat="issueCustomField in vm.form.issueCustomFields">
+ <div class="col-md-4" ng-repeat="issueCustomField in vm.form.issueCustomFields">
<div class="form-group mgb5">
<label class="issue-label">{{issueCustomField.customFieldVo.name}}</label>
<div ng-switch on="issueCustomField.customFieldVo.customFieldType">
<!-- 湲곕낯 �엯�젰 -->
<div ng-switch-when="INPUT">
+ <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="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"
@@ -269,8 +315,10 @@
</div>
</div>
</div>
+
<hr>
- <div class="row">
+
+ <div ng-show="fn.containsPartner('�뾽泥�')" class="row">
<div class="col-lg-8 fontcolor_green">
<label class="issue-label"><span class="fontcolor_green" translate="companyField.info">�뾽泥댁젙蹂�</span>
<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> �뾽泥� �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 �뾽泥� �젙蹂닿� 議고쉶�맗�땲�떎.</span>
@@ -278,7 +326,7 @@
</div>
</div>
- <div class="row">
+ <div ng-show="fn.containsPartner('�뾽泥�')" class="row">
<div class="col-lg-4">
<div class="form-group mb10">
<label class="issue-label"> <span translate="companyField.name">�뾽泥댁씠由�</span> </label>
@@ -362,7 +410,7 @@
</div>
</div>
<p></p>
- <div class="row">
+ <div ng-show="fn.containsPartner('ISP')" class="row">
<div class="col-lg-8 fontcolor_green">
<label class="issue-label"><span class="fontcolor_green" translate="ispField.info">ISP �젙蹂�</span>
<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> ISP �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 ISP �젙蹂닿� 議고쉶�맗�땲�떎.</span>
@@ -370,7 +418,7 @@
</div>
</div>
- <div class="row">
+ <div ng-show="fn.containsPartner('ISP')" class="row">
<div class="col-lg-4">
<div class="form-group mb10">
<label class="issue-label"> <span translate="ispField.name">ISP �씠由�</span> </label>
@@ -468,7 +516,7 @@
</div>
</div>
<p></p>
- <div class="row">
+ <div ng-show="fn.containsPartner('�샇�뒪�똿')" class="row">
<div class="col-lg-8 fontcolor_green">
<label class="issue-label"><span class="fontcolor_green" translate="hostingField.info">�샇�뒪�똿 �젙蹂�</span>
<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> �샇�뒪�똿 �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 �샇�뒪�똿 �젙蹂닿� 議고쉶�맗�땲�떎.</span>
@@ -476,7 +524,7 @@
</div>
</div>
- <div class="row">
+ <div ng-show="fn.containsPartner('�샇�뒪�똿')" class="row">
<div class="col-lg-4">
<div class="form-group mb10">
<label class="issue-label"> <span translate="hostingField.name">�샇�뒪�똿 �씠由�</span> </label>
@@ -607,4 +655,6 @@
ng-disabled="fn.formCheck(issueAddForm.$invalid)"
ng-click="fn.formSubmit()"><span translate="common.save">���옣</span>
</button>
-</div>
\ No newline at end of file
+</div>
+
+
--
Gitblit v1.8.0