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 | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/views/companyField/companyFieldModify.html b/src/main/webapp/views/companyField/companyFieldModify.html
index 9404e5c..ceabdac 100644
--- a/src/main/webapp/views/companyField/companyFieldModify.html
+++ b/src/main/webapp/views/companyField/companyFieldModify.html
@@ -29,6 +29,43 @@
required>
<small translate="companyField.enterSpecialCharacters">�뾽泥� �씠由꾩뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰 �븷�닔 �뾾�뒿�땲�떎.</small>
</div>
+ <div class="form-group">
+ <label class="issue-label">
+ <span translate="ispField.select">ISP �꽑�깮</span>
+ </label>
+ <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"
+ total-page="vm.autoCompletePage.ispField.totalPage"
+ input-disabled="false"
+ translation-texts="{ empty : 'common.emptyIsp' }"
+ broad-cast="ispFieldEvent"
+ extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
+ type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
+ </div>
+
+ <div class="form-group">
+ <label class="issue-label">
+ <span translate="hostingField.select">�샇�뒪�똿 �꽑�깮</span>
+ </label>
+ <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"
+ total-page="vm.autoCompletePage.hostingField.totalPage"
+ input-disabled="false"
+ translation-texts="{ empty : 'common.emptyHosting' }"
+ broad-cast="hostingFieldEvent"
+ extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
+ type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
+ </div>
<div>
<div class="form-group">
<label for="companyFieldAddForm10" class="issue-label">
@@ -43,7 +80,11 @@
ng-model="vm.form.url"
ng-maxlength="200"
maxlength="200"
+ ng-pattern="/(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/"
>
+ <div ng-show="companyFieldModifyForm.url.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<!--<div class="row">
@@ -149,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