From 57fd755996962af22fbf8f322ee03d1380044f1f Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 22 12월 2021 17:01:43 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/webapp/views/customField/customFieldModify.html |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/views/customField/customFieldModify.html b/src/main/webapp/views/customField/customFieldModify.html
index 8beb7b1..e2b3acd 100644
--- a/src/main/webapp/views/customField/customFieldModify.html
+++ b/src/main/webapp/views/customField/customFieldModify.html
@@ -107,17 +107,17 @@
                        placeholder="�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎."
                        autocomplete="off"
                        ng-model="vm.form.defaultValue">
-                <div ng-show="customFieldAddForm.ipAdress.$error.pattern" class="help-block form-text text-danger"
+                <div ng-show="customFieldModifyForm.numberType.$error.pattern" class="help-block form-text text-danger"
                      translate="common.invalidNumberFormat">�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.
                 </div>
 
                 <input ng-if="vm.form.customFieldType == 'DATETIME'"
                        name="dateTime"
                        class="form-control input-readonly"
+                       placeholder="{{'issue.clickToSelectDate' | translate}}"
                        ng-model="vm.form.defaultValue"
                        modal-form-auto-scroll
                        range-type="singleDate"
-                       onfocus="this.blur()"
                        date-range-picker>
                 <div class="row">
                     <div class="col-xs-12">
@@ -126,7 +126,7 @@
                 </div>
 
                 <input ng-if="vm.form.customFieldType == 'IP_ADDRESS'"
-                       name="ipAdress"
+                       name="ipAddress"
                        type="text"
                        class="form-control"
                        kr-input
@@ -134,7 +134,7 @@
                        placeholder="IP 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
                        autocomplete="off"
                        ng-model="vm.form.defaultValue">
-                <div ng-show="customFieldAddForm.ipAdress.$error.pattern" class="help-block form-text text-danger"
+                <div ng-show="customFieldModifyForm.ipAddress.$error.pattern" class="help-block form-text text-danger"
                      translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
                 </div>
 
@@ -148,7 +148,7 @@
                        placeholder="�씠硫붿씪 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
                        autocomplete="off"
                        ng-model="vm.form.defaultValue">
-                <div ng-show="customFieldAddForm.email.$error.pattern" class="help-block form-text text-danger"
+                <div ng-show="customFieldModifyForm.email.$error.pattern" class="help-block form-text text-danger"
                      translate="common.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
                 </div>
 
@@ -156,27 +156,27 @@
                        name="site"
                        type="text"
                        class="form-control"
-                       maxlength="30"
+                       maxlength="100"
                        kr-input
-                       ng-pattern="/(http(s)?:\/\/)([a-z0-9\w]+\.*)+[a-z0-9]{2,4}/gi"
+                       ng-pattern="/(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/"
                        placeholder="�솃�럹�씠吏� 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
                        autocomplete="off"
                        ng-model="vm.form.defaultValue">
-                <div ng-show="customFieldAddForm.site.$error.pattern" class="help-block form-text text-danger"
+                <div ng-show="customFieldModifyForm.site.$error.pattern" class="help-block form-text text-danger"
                      translate="common.invalidSiteFormat">�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http://濡� �떆�옉�븯�뀛�빞�빀�땲�떎)
                 </div>
-
 
                 <input ng-if="vm.form.customFieldType == 'TEL'"
                        name="tel"
                        type="text"
+                       maxlength="30"
                        class="form-control"
                        kr-input
                        ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
                        placeholder="�뿰�씫泥� �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
                        autocomplete="off"
                        ng-model="vm.form.defaultValue">
-                <div ng-show="customFieldAddForm.tel.$error.pattern" class="help-block form-text text-danger"
+                <div ng-show="customFieldModifyForm.tel.$error.pattern" class="help-block form-text text-danger"
                      translate="common.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
                 </div>
 

--
Gitblit v1.8.0