From a75bcc7c2b0fc98bd3a8abc100a4ad4ec11b9c26 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 28 12월 2021 15:54:35 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/views/companyField/companyFieldAdd.html | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/views/companyField/companyFieldAdd.html b/src/main/webapp/views/companyField/companyFieldAdd.html
index eda4407..3f3713f 100644
--- a/src/main/webapp/views/companyField/companyFieldAdd.html
+++ b/src/main/webapp/views/companyField/companyFieldAdd.html
@@ -32,16 +32,17 @@
<div class="form-group">
<label class="issue-label">
- <span translate="ispField.name">ISP �씠由�</span>
+ <span translate="ispField.select">ISP �꽑�깮</span>
</label>
<js-autocomplete-single data-input-name="ispField"
selected-model="vm.form.issueIspFields"
+ ng-model="vm.form.ispName"
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"
+ page="vm.autoCompletePage.ispField.page"
+ total-page="vm.autoCompletePage.ispField.totalPage"
input-disabled="false"
- translation-texts="{ empty : 'common.emptyHosting' }"
+ 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>
@@ -49,7 +50,7 @@
<div class="form-group">
<label class="issue-label">
- <span translate="hostingField.name">�샇�뒪�똿 �씠由�</span>
+ <span translate="hostingField.select">�샇�뒪�똿 �꽑�깮</span>
</label>
<js-autocomplete-single data-input-name="hostingField"
selected-model="vm.form.issueHostingFields"
@@ -78,7 +79,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@:%_\+.~#?&//=]*)/"
required>
+ <div ng-show="companyFieldAddForm.url.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
<!--<div class="row">
<div class="col-md-3">
--
Gitblit v1.8.0