From 83cd0465401d56c630611e03ca1e010eb94c1eb6 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 28 12월 2021 11:25:04 +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 | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js b/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js
index 018b3c8..91b67a4 100644
--- a/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js
+++ b/src/main/webapp/scripts/app/customField/customFieldAdd.controller.js
@@ -27,10 +27,11 @@
options : [], // �샃�뀡
optionText : "", // �샃�뀡 媛�
numberType : "",
- ipAdress : "",
+ ipAddress : "",
email : "",
site : "",
- tel : ""
+ tel : "",
+ requiredData : false
}
};
@@ -42,7 +43,7 @@
// �븘�뱶 �쑀�삎�쓣 蹂�寃� �뻽�쓣 �븣 臾몄옄�뿴 �븘�뱶�씪 寃쎌슦�뿉�뒗 �샃�뀡 媛믪쓣 珥덇린�솕�빐以��떎.
function changeFieldType() {
// if ($scope.vm.form.customFieldType === "INPUT") {
- $scope.vm.form.name = "";
+ // $scope.vm.form.name = "";
$scope.vm.form.options = [];
$scope.vm.form.optionText = "";
@@ -106,7 +107,6 @@
return true;
}
}
-
return false;
}
@@ -117,7 +117,6 @@
var content = angular.copy($scope.vm.form);
content.name = $rootScope.preventXss(content.name);
-
if ($scope.vm.form.customFieldType === 'MULTI_SELECT'|| $scope.vm.form.customFieldType === "SINGLE_SELECT") {
var convertDefaultValues = "";
@@ -127,7 +126,7 @@
}
});
- //content.defaultValue = convertDefaultValues;
+ content.defaultValue = convertDefaultValues;
}
CustomField.add($resourceProvider.getContent(
--
Gitblit v1.8.0