From 630139285a3951392474980c10b4e2f802c2ac71 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 08 12월 2021 10:34:03 +0900
Subject: [PATCH] 이슈 추가,수정 시 multiselect 형태인 사용자정의필드 필수값 체크 못하는 오류 해결
---
src/main/webapp/views/issue/issueAdd.html | 5 +++--
src/main/webapp/views/issue/issueModify.html | 5 +++--
src/main/webapp/scripts/app/issue/issueAdd.controller.js | 8 +-------
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAdd.controller.js b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
index 8881e58..f9a4215 100644
--- a/src/main/webapp/scripts/app/issue/issueAdd.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAdd.controller.js
@@ -58,8 +58,7 @@
attachedFiles : [], // �꽟癒몃끂�듃濡� �뙆�씪 �뾽濡쒕뱶瑜� �븷 寃쎌슦 �꽌踰꾩뿉�꽌 pk瑜� �뵲怨� issue id�� �뿰�룞 �옉�뾽�씠 �븘�슂�븯�떎.
startCompleteDateRange : "", // �떆�옉�씪 ~ 醫낅즺�씪
detectingDateRange : "", // �깘吏��씪
- issueCustomFields : [], // �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �궗�슜�옄 �젙�쓽 �븘�뱶
- requiredDatas : [] // �궗�슜�옄 �젙�쓽 �븘�뱶 �븘�닔 �뜲�씠�꽣 泥댄겕
+ issueCustomFields : [] // �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �궗�슜�옄 �젙�쓽 �븘�뱶
},
infiniteAdd : false, // �뿰�냽 �깮�꽦
projectName : "", // �봽濡쒖젥�듃 紐� 寃��깋
@@ -687,7 +686,6 @@
// �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶
function getIssueTypeCustomFields() {
$scope.vm.form.issueCustomFields = [];
- $scope.vm.form.requiredDatas = [];
// �씠�뒋 ���엯 �븘�씠�뵒�굹 �봽濡쒖젥�듃 �븘�씠�뵒媛� �뾾�쑝硫� �넻�떊�쓣 �븯吏� �븡�뒗�떎.
if (!$rootScope.isDefined($scope.vm.form.issueTypeId) || $scope.vm.form.projects.length < 1) {
return;
@@ -703,7 +701,6 @@
if (result.data.message.status === "success") {
$scope.vm.form.issueCustomFields = [];
- $scope.vm.form.requiredDatas = [];
angular.forEach(result.data.data, function (issueTypeCustomField) {
switch (issueTypeCustomField.customFieldVo.customFieldType) {
case "INPUT" :
@@ -732,9 +729,6 @@
break;
}
$scope.vm.form.issueCustomFields.push(issueTypeCustomField);
- if(issueTypeCustomField.customFieldVo.requiredData === "Y") {
- $scope.vm.form.requiredDatas.push(issueTypeCustomField.customFieldVo.requiredData);
- }
});
}
else {
diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html
index 219dfdf..690c9ab 100644
--- a/src/main/webapp/views/issue/issueAdd.html
+++ b/src/main/webapp/views/issue/issueAdd.html
@@ -347,13 +347,14 @@
<!-- 硫��떚 ���젆�듃 -->
<div ng-switch-when="MULTI_SELECT">
<ng-dropdown-multiselect class="multiSelect cursor"
- name="multiSelect"
- ng-required="issueCustomField.customFieldVo.requiredData == 'Y'"
data-input-name=""
modal-form-auto-scroll
selected-model="issueCustomField.useValues"
extra-settings="{ 'idProp' : 'value', 'externalIdProp' : 'value', 'displayProp' : 'value', 'stringTypeOption' : 'true', stopRemoveBodyEvent : true }"
options="issueCustomField.customFieldVo.customFieldValueVos"></ng-dropdown-multiselect>
+ <input class="form-control input-sm issue-select-label"
+ type="hidden" name="multiSelect" ng-model="issueCustomField.useValues[0]"
+ ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
<small class="help-block form-text text-danger"
ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
ng-if="issueAddForm.multiSelect.$error.required"
diff --git a/src/main/webapp/views/issue/issueModify.html b/src/main/webapp/views/issue/issueModify.html
index 352912d..6034426 100644
--- a/src/main/webapp/views/issue/issueModify.html
+++ b/src/main/webapp/views/issue/issueModify.html
@@ -347,13 +347,14 @@
<!-- 硫��떚 ���젆�듃 -->
<div ng-switch-when="MULTI_SELECT">
<ng-dropdown-multiselect class="multiSelect cursor"
- name="multiSelect"
- ng-required="issueCustomField.customFieldVo.requiredData == 'Y'"
data-input-name=""
modal-form-auto-scroll
selected-model="issueCustomField.useValues"
extra-settings="{ 'idProp' : 'value', 'externalIdProp' : 'value', 'displayProp' : 'value', 'stringTypeOption' : 'true', stopRemoveBodyEvent : true }"
options="issueCustomField.customFieldVo.customFieldValueVos"></ng-dropdown-multiselect>
+ <input class="form-control input-sm issue-select-label"
+ type="hidden" name="multiSelect" ng-model="issueCustomField.useValues[0]"
+ ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
<small class="help-block form-text text-danger"
ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
ng-if="issueAddForm.multiSelect.$error.required"
--
Gitblit v1.8.0