From e60f829f9d975a88673f0e6922f1c9c1228f89ea Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 금, 03 12월 2021 18:30:33 +0900 Subject: [PATCH] 사용자정의 필드 날짜 수정, 프로젝트 생성시 대쉬보드 이동 오류 수정 --- src/main/webapp/views/customField/customFieldAdd.html | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/webapp/views/customField/customFieldAdd.html b/src/main/webapp/views/customField/customFieldAdd.html index ec866c6..0610908 100644 --- a/src/main/webapp/views/customField/customFieldAdd.html +++ b/src/main/webapp/views/customField/customFieldAdd.html @@ -105,21 +105,22 @@ 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="customFieldAddForm.numberType.$error.pattern" class="help-block form-text text-danger" translate="common.invalidNumberFormat">�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎. </div> <input ng-if="vm.form.customFieldType == 'DATETIME'" name="dateTime" - type="text" - class="form-control" - kr-input - ng-pattern="/^(19|20)\d{2}-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[0-1])$/" - placeholder="�궇吏� �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎." - autocomplete="off" - ng-model="vm.form.defaultValue"> - <div ng-show="customFieldAddForm.dateTime.$error.pattern" class="help-block form-text text-danger" - translate="common.invalidDateFormat">�궇吏� �삎�떇�씠 留욎� �븡�뒿�땲�떎.(xxxx-xx-xx) + class="form-control input-readonly" + placeholder="{{'issue.clickToSelectDate' | translate}}" + ng-model="vm.form.defaultValue" + modal-form-auto-scroll + range-type="singleDate" + date-range-picker> + <div class="row"> + <div class="col-xs-12"> + <div id="createdWidget" class="bootstrap-datepicker "></div> + </div> </div> <input ng-if="vm.form.customFieldType == 'IP_ADDRESS'" @@ -155,7 +156,7 @@ class="form-control" maxlength="30" kr-input - ng-pattern="/(http(s)?:\/\/)([a-z0-9\w]+\.*)+[a-z0-9]{2,4}/gi" + ng-pattern="/((http|https):\/\/)?(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/" placeholder="�솃�럹�씠吏� 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎." autocomplete="off" ng-model="vm.form.defaultValue"> @@ -204,4 +205,4 @@ ng-click="fn.formSubmit()"><span translate="common.save">���옣</span> </button> </div> -</div> +</div> \ No newline at end of file -- Gitblit v1.8.0