From e1b40382870ca605d347c6a351530f9f30b0390d Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 07 12월 2021 11:45:33 +0900
Subject: [PATCH] 연관 이슈 추가 버튼 클릭시 $compile:nonassign 오류 수정
---
src/main/webapp/views/issue/issueModify.html | 95 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 78 insertions(+), 17 deletions(-)
diff --git a/src/main/webapp/views/issue/issueModify.html b/src/main/webapp/views/issue/issueModify.html
index ec51092..f356cc6 100644
--- a/src/main/webapp/views/issue/issueModify.html
+++ b/src/main/webapp/views/issue/issueModify.html
@@ -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>
@@ -128,7 +129,7 @@
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">
@@ -210,6 +211,19 @@
</div>
</div>
</div>
+
+ <div class="row">
+ <div class="col-sm-4">
+ <select id="relationIssueType"
+ name="relationIssueType"
+ class="form-control input-sm"
+ ng-options="option.name for option in vm.relationIssueTypes track by option.id"
+ ng-model="vm.relationIssueType"
+ required>
+ </select>
+ </div>
+ </div>
+
<hr>
<div class="row">
<div class="col-lg-4 fontcolor_green">
@@ -233,6 +247,51 @@
<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"
@@ -270,7 +329,7 @@
</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,14 +337,14 @@
</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>
- <js-autocomplete-single data-input-name="companyField"
- selected-model="vm.form.companyFields"
+ <js-autocomplete-single data-input-name="issueCompanyField"
+ selected-model="vm.form.issueCompanyFields"
search="vm.companyName"
- source="fn.getCompanyFieldList(vm.companyName, vm.form.companyFields, vm.autoCompletePage.companyField.page, fn.getCompanyFieldListCallBack)"
+ source="fn.getIssueCompanyFieldList(vm.companyName, vm.form.issueCompanyFields, vm.autoCompletePage.companyField.page, fn.getIssueCompanyFieldListCallBack)"
page="vm.autoCompletePage.companyField.page"
total-page="vm.autoCompletePage.companyField.totalPage"
input-disabled="false"
@@ -362,7 +421,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,14 +429,14 @@
</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>
<js-autocomplete-single data-input-name="ispField"
- selected-model="vm.form.ispFields"
+ selected-model="vm.form.issueIspFields"
search="vm.ispName"
- source="fn.getIspFieldList(vm.ispName, vm.form.ispFields, vm.autoCompletePage.ispField.page, fn.getIspFieldListCallBack)"
+ source="fn.getIssueIspFieldList(vm.ispName, vm.form.issueIspFields, vm.autoCompletePage.ispField.page, fn.getIssueIspFieldListCallBack)"
page="vm.autoCompletePage.ispField.page"
total-page="vm.autoCompletePage.ispField.totalPage"
input-disabled="false"
@@ -468,7 +527,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,14 +535,14 @@
</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>
<js-autocomplete-single data-input-name="hostingField"
- selected-model="vm.form.hostingFields"
+ selected-model="vm.form.issueHostingFields"
search="vm.hostingName"
- source="fn.getHostingFieldList(vm.hostingName, vm.form.hostingFields, vm.autoCompletePage.hostingField.page, fn.getHostingFieldListCallBack)"
+ source="fn.getIssueHostingFieldList(vm.hostingName, vm.form.issueHostingFields, vm.autoCompletePage.hostingField.page, fn.getIssueHostingFieldListCallBack)"
page="vm.autoCompletePage.hostingField.page"
total-page="vm.autoCompletePage.hostingField.totalPage"
input-disabled="false"
@@ -607,4 +666,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