Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

jhjang

2021-12-07 30ddd2cf095d2857ba1134fb3deaf51392ef1030

 src/main/webapp/scripts/app/customField/customFieldAdd.controller.js

@@ -30,7 +30,8 @@
                        ipAdress : "",
                        email : "",
                        site : "",
                        tel : ""
                        tel : "",
                        requiredData : ""
                    }
                };

@@ -106,7 +107,6 @@
                            return true;
                        }
                    }

                    return false;
                }

@@ -116,7 +116,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 = "";