From c324b3949406123cbeb323c180857d57712b945e Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 27 12월 2021 16:41:53 +0900
Subject: [PATCH] 사용자 정의 필드 필수 항목 표시 변경 롤백 (jquery로 pattern 조건 변경 예정)
---
src/main/webapp/views/customField/customFieldAdd.html | 47 +++++++++++------------
src/main/webapp/views/customField/customFieldModify.html | 51 +++++++++++--------------
2 files changed, 45 insertions(+), 53 deletions(-)
diff --git a/src/main/webapp/views/customField/customFieldAdd.html b/src/main/webapp/views/customField/customFieldAdd.html
index 49c46df..97a7031 100644
--- a/src/main/webapp/views/customField/customFieldAdd.html
+++ b/src/main/webapp/views/customField/customFieldAdd.html
@@ -91,7 +91,7 @@
<div class="form-group">
<label for="customFieldAddForm3"><span translate="customField.defaultValue">湲곕낯媛�</span> </label>
- <input ng-show="vm.form.customFieldType == 'INPUT' || vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'"
+ <input ng-if="vm.form.customFieldType == 'INPUT' || vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'"
id="customFieldAddForm3"
type="text"
name="defaultValue"
@@ -103,7 +103,7 @@
autocomplete="off">
- <input ng-show="vm.form.customFieldType == 'NUMBER'"
+ <input ng-if="vm.form.customFieldType == 'NUMBER'"
name="numberType"
type="text"
class="form-control"
@@ -112,8 +112,11 @@
placeholder="�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
ng-model="vm.form.defaultValue">
+ <div ng-if="vm.form.customFieldType == 'NUMBER'" ng-if="customFieldAddForm.numberType.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidNumberFormat">�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.
+ </div>
- <input ng-show="vm.form.customFieldType == 'DATETIME'"
+ <input ng-if="vm.form.customFieldType == 'DATETIME'"
name="dateTime"
class="form-control input-readonly"
placeholder="{{'issue.clickToSelectDate' | translate}}"
@@ -127,7 +130,7 @@
</div>
</div>
- <input ng-show="vm.form.customFieldType == 'IP_ADDRESS'"
+ <input ng-if="vm.form.customFieldType == 'IP_ADDRESS'"
name="ipAddress"
type="text"
class="form-control"
@@ -136,8 +139,11 @@
placeholder="IP 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
ng-model="vm.form.defaultValue">
+ <div ng-if="customFieldAddForm.ipAddress.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
- <input ng-show="vm.form.customFieldType == 'EMAIL'"
+ <input ng-if="vm.form.customFieldType == 'EMAIL'"
name="email"
type="email"
class="form-control"
@@ -147,8 +153,11 @@
placeholder="�씠硫붿씪 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
ng-model="vm.form.defaultValue">
+ <div ng-if="customFieldAddForm.email.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
- <input ng-show="vm.form.customFieldType == 'SITE'"
+ <input ng-if="vm.form.customFieldType == 'SITE'"
name="site"
type="text"
class="form-control"
@@ -158,8 +167,11 @@
placeholder="�솃�럹�씠吏� 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
ng-model="vm.form.defaultValue">
+ <div ng-if="customFieldAddForm.site.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidSiteFormat">�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http://濡� �떆�옉�븯�뀛�빞�빀�땲�떎)
+ </div>
- <input ng-show="vm.form.customFieldType == 'TEL'"
+ <input ng-if="vm.form.customFieldType == 'TEL'"
name="tel"
type="text"
maxlength="30"
@@ -169,6 +181,10 @@
placeholder="�뿰�씫泥� �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
ng-model="vm.form.defaultValue">
+
+ <div ng-if="customFieldAddForm.tel.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
<small ng-if="vm.form.customFieldType == 'INPUT'" translate="common.upTo100Characters">
理쒕� 100湲��옄源뚯� �엯�젰�븷 �닔 �엳�뒿�땲�떎.
@@ -182,23 +198,6 @@
translate="customField.selectMultiFieldListHashTag">
�떎以� �꽑�깮 �븘�뱶 紐⑸줉�뿉 �엳�뒗 媛믪쓣 湲곕낯�쟻�쑝濡� �꽑�깮�븯怨� �떢�쓣 �븣�뒗 �빐�떆�깭洹몃�� �궗�슜�빐�빞�빀�땲�떎. ex) #���긽媛�#���긽媛�
</div>
-
- <div ng-if="customFieldAddForm.numberType.$error.pattern && vm.form.customFieldType == 'NUMBER'" class="help-block form-text text-danger"
- translate="common.invalidNumberFormat">�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.
- </div>
- <div ng-if="customFieldAddForm.ipAddress.$error.pattern && vm.form.customFieldType == 'IP_ADDRESS'" class="help-block form-text text-danger"
- translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
- </div>
- <div ng-if="customFieldAddForm.email.$error.pattern && vm.form.customFieldType == 'EMAIL'" class="help-block form-text text-danger"
- translate="common.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
- </div>
- <div ng-if="customFieldAddForm.site.$error.pattern && vm.form.customFieldType == 'SITE'" class="help-block form-text text-danger"
- translate="common.invalidSiteFormat">�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http://濡� �떆�옉�븯�뀛�빞�빀�땲�떎)
- </div>
- <div ng-if="customFieldAddForm.tel.$error.pattern && vm.form.customFieldType == 'TEL'" class="help-block form-text text-danger"
- translate="common.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
- </div>
-
</div>
</form>
diff --git a/src/main/webapp/views/customField/customFieldModify.html b/src/main/webapp/views/customField/customFieldModify.html
index e366d8e..2b1b3b8 100644
--- a/src/main/webapp/views/customField/customFieldModify.html
+++ b/src/main/webapp/views/customField/customFieldModify.html
@@ -93,7 +93,7 @@
<div class="form-group">
<label for="customFieldModifyForm3"><span translate="customField.defaultValue">湲곕낯媛�</span> </label>
- <input ng-show="vm.form.customFieldType == 'INPUT' || vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'"
+ <input ng-if="vm.form.customFieldType == 'INPUT' || vm.form.customFieldType == 'SINGLE_SELECT' || vm.form.customFieldType == 'MULTI_SELECT'"
id="customFieldModifyForm3"
type="text"
name="defaultValue"
@@ -104,7 +104,7 @@
ng-maxlength="100"
autocomplete="off">
- <input ng-show="vm.form.customFieldType == 'NUMBER'"
+ <input ng-if="vm.form.customFieldType == 'NUMBER'"
name="numberType"
type="text"
class="form-control"
@@ -113,9 +113,11 @@
placeholder="�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
ng-model="vm.form.defaultValue">
+ <div ng-if="customFieldModifyForm.numberType.$error.pattern && vm.form.customFieldType == 'NUMBER'" class="help-block form-text text-danger"
+ translate="common.invalidNumberFormat">�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.
+ </div>
-
- <input ng-show="vm.form.customFieldType == 'DATETIME'"
+ <input ng-if="vm.form.customFieldType == 'DATETIME'"
name="dateTime"
class="form-control input-readonly"
placeholder="{{'issue.clickToSelectDate' | translate}}"
@@ -129,7 +131,7 @@
</div>
</div>
- <input ng-show="vm.form.customFieldType == 'IP_ADDRESS'"
+ <input ng-if="vm.form.customFieldType == 'IP_ADDRESS'"
name="ipAddress"
type="text"
class="form-control"
@@ -138,9 +140,11 @@
placeholder="IP 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
ng-model="vm.form.defaultValue">
+ <div ng-if="customFieldModifyForm.ipAddress.$error.pattern && vm.form.customFieldType == 'IP_ADDRESS'" class="help-block form-text text-danger"
+ translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
-
- <input ng-show="vm.form.customFieldType == 'EMAIL'"
+ <input ng-if="vm.form.customFieldType == 'EMAIL'"
name="email"
type="email"
class="form-control"
@@ -150,9 +154,11 @@
placeholder="�씠硫붿씪 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
ng-model="vm.form.defaultValue">
+ <div ng-if="customFieldModifyForm.email.$error.pattern && vm.form.customFieldType == 'EMAIL'" class="help-block form-text text-danger"
+ translate="common.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
-
- <input ng-show="vm.form.customFieldType == 'SITE'"
+ <input ng-if="vm.form.customFieldType == 'SITE'"
name="site"
type="text"
class="form-control"
@@ -162,9 +168,11 @@
placeholder="�솃�럹�씠吏� 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
ng-model="vm.form.defaultValue">
+ <div ng-if="customFieldModifyForm.site.$error.pattern && vm.form.customFieldType == 'SITE'" class="help-block form-text text-danger"
+ translate="common.invalidSiteFormat">�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http://濡� �떆�옉�븯�뀛�빞�빀�땲�떎)
+ </div>
-
- <input ng-show="vm.form.customFieldType == 'TEL'"
+ <input ng-if="vm.form.customFieldType == 'TEL'"
name="tel"
type="text"
maxlength="30"
@@ -174,7 +182,9 @@
placeholder="�뿰�씫泥� �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
autocomplete="off"
ng-model="vm.form.defaultValue">
-
+ <div ng-if="customFieldModifyForm.tel.$error.pattern && vm.form.customFieldType == 'TEL'" class="help-block form-text text-danger"
+ translate="common.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
<!-- <small ng-if="customFieldModifyForm.defaultValue.$error.maxlength"-->
<!-- class="help-block form-text text-danger" translate="common.upTo100Characters">-->
@@ -191,23 +201,6 @@
translate="customField.selectMultiFieldListHashTag">
�떎以� �꽑�깮 �븘�뱶 紐⑸줉�뿉 �엳�뒗 媛믪쓣 湲곕낯�쟻�쑝濡� �꽑�깮�븯怨� �떢�쓣 �븣�뒗 �빐�떆�깭洹몃�� �궗�슜�빐�빞�빀�땲�떎. ex) #���긽媛�#���긽媛�
</div>
-
- <div ng-if="customFieldModifyForm.numberType.$error.pattern && vm.form.customFieldType == 'NUMBER'" class="help-block form-text text-danger"
- translate="common.invalidNumberFormat">�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.
- </div>
- <div ng-if="customFieldModifyForm.ipAddress.$error.pattern && vm.form.customFieldType == 'IP_ADDRESS'" class="help-block form-text text-danger"
- translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
- </div>
- <div ng-if="customFieldModifyForm.email.$error.pattern && vm.form.customFieldType == 'EMAIL'" class="help-block form-text text-danger"
- translate="common.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
- </div>
- <div ng-if="customFieldModifyForm.site.$error.pattern && vm.form.customFieldType == 'SITE'" class="help-block form-text text-danger"
- translate="common.invalidSiteFormat">�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http://濡� �떆�옉�븯�뀛�빞�빀�땲�떎)
- </div>
- <div ng-if="customFieldModifyForm.tel.$error.pattern && vm.form.customFieldType == 'TEL'" class="help-block form-text text-danger"
- translate="common.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
- </div>
-
</div>
</form>
--
Gitblit v1.8.0