From a6d9e4215d55507bec2d9c80067cdf8cd9e4dca7 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 28 12월 2021 20:45:29 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/companyField/companyFieldModify.html | 4 +++-
src/main/webapp/views/companyField/companyFieldAdd.html | 2 ++
src/main/webapp/views/common/sidebar.html | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/views/common/sidebar.html b/src/main/webapp/views/common/sidebar.html
index efc07ac..cdb4dec 100644
--- a/src/main/webapp/views/common/sidebar.html
+++ b/src/main/webapp/views/common/sidebar.html
@@ -363,7 +363,7 @@
<span translate="common.customHostingField">�샇�뒪�똿 愿�由�</span></a>
</li>
- <li class="sub-header" ng-if="$root.checkMngPermissionManager()">
+ <li class="sub-header">
<span>Management</span>
</li>
<li class="" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_NOTICE')">
diff --git a/src/main/webapp/views/companyField/companyFieldAdd.html b/src/main/webapp/views/companyField/companyFieldAdd.html
index 3f3713f..71a999d 100644
--- a/src/main/webapp/views/companyField/companyFieldAdd.html
+++ b/src/main/webapp/views/companyField/companyFieldAdd.html
@@ -37,6 +37,7 @@
<js-autocomplete-single data-input-name="ispField"
selected-model="vm.form.issueIspFields"
ng-model="vm.form.ispName"
+ custom-input="true"
search="vm.form.ispName"
source="fn.getIssueIspFieldList(vm.ispName, vm.form.issueIspFields, vm.autoCompletePage.issueIspFields.page, fn.getIssueIspFieldListCallBack)"
page="vm.autoCompletePage.ispField.page"
@@ -55,6 +56,7 @@
<js-autocomplete-single data-input-name="hostingField"
selected-model="vm.form.issueHostingFields"
ng-model="vm.form.hostingName"
+ custom-input="true"
search="vm.hostingName"
source="fn.getIssueHostingFieldList(vm.hostingName, vm.form.issueHostingFields, vm.autoCompletePage.hostingField.page, fn.getIssueHostingFieldListCallBack)"
page="vm.autoCompletePage.hostingField.page"
diff --git a/src/main/webapp/views/companyField/companyFieldModify.html b/src/main/webapp/views/companyField/companyFieldModify.html
index b15fbb4..ceabdac 100644
--- a/src/main/webapp/views/companyField/companyFieldModify.html
+++ b/src/main/webapp/views/companyField/companyFieldModify.html
@@ -36,6 +36,7 @@
<js-autocomplete-single data-input-name="ispField"
selected-model="vm.form.issueIspFields"
ng-model="vm.form.ispName"
+ custom-input="true"
search="vm.form.ispName"
source="fn.getIssueIspFieldList(vm.ispName, vm.form.issueIspFields, vm.autoCompletePage.issueIspFields.page, fn.getIssueIspFieldListCallBack)"
page="vm.autoCompletePage.ispField.page"
@@ -54,6 +55,7 @@
<js-autocomplete-single data-input-name="hostingField"
selected-model="vm.form.issueHostingFields"
ng-model="vm.form.hostingName"
+ custom-input="true"
search="vm.form.hostingName"
source="fn.getIssueHostingFieldList(vm.hostingName, vm.form.issueHostingFields, vm.autoCompletePage.hostingField.page, fn.getIssueHostingFieldListCallBack)"
page="vm.autoCompletePage.hostingField.page"
@@ -188,7 +190,7 @@
type="text"
class="form-control"
kr-input
- input-regex="[^0-9]"
+ ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
autocomplete="off"
ng-model="vm.form.tel"
maxlength="20"
--
Gitblit v1.8.0