From 302e1ed0c621e9b3d052ad42f105120ee9775c36 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 07 12월 2021 22:10:37 +0900
Subject: [PATCH] 사용자정의필드 수정
---
src/main/webapp/scripts/components/utils/autoComplete.controller.js | 12 +++++++-----
src/main/webapp/views/customField/customFieldModify.html | 1 +
src/main/webapp/views/issue/issueModify.html | 4 ++--
src/main/webapp/scripts/app/customField/customFieldModify.controller.js | 10 ++++++++--
4 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/scripts/app/customField/customFieldModify.controller.js b/src/main/webapp/scripts/app/customField/customFieldModify.controller.js
index a0ff0e9..61cb612 100644
--- a/src/main/webapp/scripts/app/customField/customFieldModify.controller.js
+++ b/src/main/webapp/scripts/app/customField/customFieldModify.controller.js
@@ -164,7 +164,8 @@
content.ipAdress = $scope.vm.form.ipAdress;
content.email = $scope.vm.form.email;
content.site = $scope.vm.form.site;
- content.tel =$scope.vm.form.tel;
+ content.tel = $scope.vm.form.tel;
+ content.requiredData = $scope.vm.form.requiredData;
if ($scope.vm.form.customFieldType === 'MULTI_SELECT'|| $scope.vm.form.customFieldType === "SINGLE_SELECT") {
var convertDefaultValues = "";
@@ -218,7 +219,12 @@
$scope.vm.form.customFieldType = result.data.data.customFieldType;
$scope.vm.form.defaultValue = result.data.data.defaultValue;
$scope.vm.form.useCustomFieldValue = result.data.data.useCustomFieldValue;
- $scope.vm.form.requiredData = result.data.data.requiredData;
+
+ if(result.data.data.requiredData === "Y"){
+ $scope.vm.form.requiredData = true;
+ } else {
+ $scope.vm.form.requiredData = false;
+ }
angular.forEach(result.data.data.customFieldValueVos, function (customFieldValueVo) {
$scope.vm.form.options.push(customFieldValueVo.value);
diff --git a/src/main/webapp/scripts/components/utils/autoComplete.controller.js b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
index 6402006..d40a45f 100644
--- a/src/main/webapp/scripts/components/utils/autoComplete.controller.js
+++ b/src/main/webapp/scripts/components/utils/autoComplete.controller.js
@@ -345,11 +345,13 @@
conditions, $resourceProvider.getPageContent($rootScope.isDefined(page) ? page : 0, $rootScope.isDefined(page) ? 10 : 25))).then(function (result) {
if (result.data.message.status === "success") {
const departments = result.data.data;
- var filterDepartments = departments.filter(function(item, idx){
- return departments.findIndex(function(item2, idx2){
- return item.departmentName === item2.departmentName
- }) == idx;
- });
+ if(departments != null && departments.length() > 0){
+ var filterDepartments = departments.filter(function(item, idx){
+ return departments.findIndex(function(item2, idx2){
+ return item.departmentName === item2.departmentName
+ }) == idx;
+ });
+ }
if ($rootScope.isDefined(callBack)) {
callBack(result);
diff --git a/src/main/webapp/views/customField/customFieldModify.html b/src/main/webapp/views/customField/customFieldModify.html
index 1360aed..8beb7b1 100644
--- a/src/main/webapp/views/customField/customFieldModify.html
+++ b/src/main/webapp/views/customField/customFieldModify.html
@@ -35,6 +35,7 @@
<div class="form-group">
<label for="customFieldModifyForm2"><span translate="customField.fieldType">�븘�뱶 �쑀�삎</span><code
class="highlighter-rouge">*</code></label>
+ <label> <input type="checkbox" ng-model="vm.form.requiredData"> �븘�닔 �뜲�씠�꽣 </label>
<select id="customFieldModifyForm2" class="form-control" ng-model="vm.form.customFieldType"
ng-change="fn.changeCustomFieldType()">
<option value="INPUT" translate="common.stringField">臾몄옄�뿴 �븘�뱶</option>
diff --git a/src/main/webapp/views/issue/issueModify.html b/src/main/webapp/views/issue/issueModify.html
index e737e65..352912d 100644
--- a/src/main/webapp/views/issue/issueModify.html
+++ b/src/main/webapp/views/issue/issueModify.html
@@ -219,7 +219,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">
@@ -228,7 +228,7 @@
</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>
--
Gitblit v1.8.0