From d4baca463f7d9459d137c53139cf415c78642bf3 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 29 11월 2021 17:03:49 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/customField/customFieldAdd.controller.js | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js b/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js
index 563582d..37838b8 100644
--- a/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js
+++ b/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js
@@ -41,10 +41,10 @@
// �븘�뱶 �쑀�삎�쓣 蹂�寃� �뻽�쓣 �븣 臾몄옄�뿴 �븘�뱶�씪 寃쎌슦�뿉�뒗 �샃�뀡 媛믪쓣 珥덇린�솕�빐以��떎.
function changeFieldType() {
- if ($scope.vm.form.customFieldType === "INPUT") {
- $scope.vm.form.options = [];
- $scope.vm.form.optionText = "";
- }
+ // if ($scope.vm.form.customFieldType === "INPUT") {
+ $scope.vm.form.name = "";
+ $scope.vm.form.options = [];
+ $scope.vm.form.optionText = "";
$scope.vm.form.defaultValue = "";
}
@@ -165,11 +165,7 @@
var content = angular.copy($scope.vm.form);
content.name = $rootScope.preventXss(content.name);
- content.numberType = $rootScope.preventXss(content.numberType);
- content.ipAdress = $rootScope.preventXss(content.ipAdress);
- content.email = $rootScope.preventXss(content.email);
- content.site = $rootScope.preventXss(content.site);
- content.tel = $rootScope.preventXss(content.tel);
+
if ($scope.vm.form.customFieldType === 'MULTI_SELECT'|| $scope.vm.form.customFieldType === "SINGLE_SELECT") {
var convertDefaultValues = "";
@@ -180,7 +176,7 @@
}
});
- content.defaultValue = convertDefaultValues;
+ //content.defaultValue = convertDefaultValues;
}
CustomField.add($resourceProvider.getContent(
--
Gitblit v1.8.0