From bc80899423fce09be34baf72ac04fca915f3dea0 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 22 12월 2021 14:27:29 +0900
Subject: [PATCH] 이슈추가, 수정 탐지정보 사용자 정의필드 정규표현식 추가
---
src/main/webapp/views/issue/issueModify.html | 113 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 82 insertions(+), 31 deletions(-)
diff --git a/src/main/webapp/views/issue/issueModify.html b/src/main/webapp/views/issue/issueModify.html
index f7264f5..a9429c3 100644
--- a/src/main/webapp/views/issue/issueModify.html
+++ b/src/main/webapp/views/issue/issueModify.html
@@ -9,11 +9,11 @@
</div>
<div class="modal-body">
- <form role="form" name="issueAddForm">
+ <form role="form" name="issueModifyForm">
<div class="form-group mb10">
- <label for="issueAddForm1" class="issue-label"><span translate="issue.issueTitle">�씠�뒋 �젣紐�</span> <code
+ <label for="issueModifyForm1" class="issue-label"><span translate="issue.issueTitle">�씠�뒋 �젣紐�</span> <code
class="highlighter-rouge">*</code></label>
- <input id="issueAddForm1"
+ <input id="issueModifyForm1"
class="form-control input-sm"
ng-model="vm.form.title"
name="title"
@@ -24,7 +24,7 @@
autofocus
owl-auto-focus>
<small class="help-block form-text text-danger"
- ng-if="issueAddForm.title.$touched && issueAddForm.title.$error.required"
+ ng-if="issueModifyForm.title.$touched && issueModifyForm.title.$error.required"
translate="issue.requireIssueTitle">�씠�뒋 �젣紐⑹쓣 �엯�젰�븯�꽭�슂.
</small>
</div>
@@ -50,10 +50,10 @@
<div class="row">
<div class="col-md-4">
<div class="form-group mb10">
- <label for="issueAddForm4" class="issue-label"> <span
+ <label for="issueModifyForm4" class="issue-label"> <span
translate="issue.issueType">�씠�뒋 ���엯</span>
<code class="highlighter-rouge">*</code></label>
- <select id="issueAddForm4"
+ <select id="issueModifyForm4"
name="issueType"
class="form-control input-sm issue-select-label"
ng-model="vm.form.issueTypeId"
@@ -73,11 +73,11 @@
</div>
<div class="col-md-4">
<div class="form-group mb10">
- <label for="issueAddForm2" class="issue-label">
+ <label for="issueModifyForm2" class="issue-label">
<span translate="common.priority">�슦�꽑 �닚�쐞</span>
<code class="highlighter-rouge">*</code>
</label>
- <select id="issueAddForm2"
+ <select id="issueModifyForm2"
name="priority"
class="form-control input-sm issue-select-label"
ng-model="vm.form.priorityId"
@@ -96,10 +96,10 @@
</div>
<div class="col-md-4">
<div class="form-group mb10">
- <label for="issueAddForm3" class="issue-label"> <span
+ <label for="issueModifyForm3" class="issue-label"> <span
translate="common.importance">以묒슂�룄</span> <code
class="highlighter-rouge">*</code></label>
- <select id="issueAddForm3"
+ <select id="issueModifyForm3"
name="severity"
class="form-control input-sm issue-select-label"
ng-model="vm.form.severityId"
@@ -143,8 +143,8 @@
<div class="col-lg-4">
<div class="form-group mb10">
- <label for="issueAddForm5" class="issue-label"> <span translate="common.period">湲곌컙</span></label>
- <input id="issueAddForm5"
+ <label for="issueModifyForm5" class="issue-label"> <span translate="common.period">湲곌컙</span></label>
+ <input id="issueModifyForm5"
tabindex="-1"
type="text"
readonly
@@ -236,7 +236,7 @@
<!-- 湲곕낯 �엯�젰 -->
<div ng-switch-when="INPUT">
<input type="text" class="form-control input-sm"
- name="input"
+ name="inputValue"
ng-model="issueCustomField.useValues"
maxlength="100"
autocomplete="off"
@@ -244,24 +244,29 @@
ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
<small class="help-block form-text text-danger"
ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
- ng-if="issueAddForm.input.$error.required"
+ ng-if="issueModifyForm.inputValue.$error.required"
translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄�젙�쓽�븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
</small>
</div>
<div ng-switch-when="NUMBER">
<input type="text" class="form-control input-sm"
- name="number"
+ name="numberType"
ng-model="issueCustomField.useValues"
maxlength="100"
autocomplete="off"
kr-input
+ ng-pattern="/^[0-9]*$/"
+ placeholder="�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎."
ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
<small class="help-block form-text text-danger"
ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
- ng-if="issueAddForm.number.$error.required"
+ ng-if="issueModifyForm.numberType.$error.required"
translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
</small>
+ <div ng-show="issueModifyForm.numberType.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidNumberFormat">�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.
+ </div>
</div>
<div ng-switch-when="DATETIME">
@@ -274,7 +279,7 @@
ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
<small class="help-block form-text text-danger"
ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
- ng-if="issueAddForm.dateTime.$error.required"
+ ng-if="issueModifyForm.dateTime.$error.required"
translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
</small>
</div>
@@ -286,12 +291,36 @@
maxlength="100"
autocomplete="off"
kr-input
+ ng-pattern="/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/"
+ placeholder="IP 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
<small class="help-block form-text text-danger"
ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
- ng-if="issueAddForm.ipAddress.$error.required"
+ ng-if="issueModifyForm.ipAddress.$error.required"
translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
</small>
+ <div ng-show="issueModifyForm.ipAddress.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
+ </div>
+
+ <div ng-switch-when="EMAIL">
+ <input type="email" class="form-control input-sm"
+ name="email"
+ maxlength="30"
+ ng-model="issueCustomField.useValues"
+ kr-input
+ ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/"
+ placeholder="�씠硫붿씪 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
+ ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
+ <small class="help-block form-text text-danger"
+ ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
+ ng-if="issueModifyForm.ipAddress.$error.required"
+ translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
+ </small>
+ <div ng-show="issueModifyForm.email.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
<div ng-switch-when="SITE">
@@ -301,27 +330,37 @@
maxlength="100"
autocomplete="off"
kr-input
+ ng-pattern="/(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/"
+ placeholder="�솃�럹�씠吏� 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
<small class="help-block form-text text-danger"
ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
- ng-if="issueAddForm.site.$error.required"
+ ng-if="issueModifyForm.site.$error.required"
translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
</small>
+ <div ng-show="issueModifyForm.site.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidSiteFormat">�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http://濡� �떆�옉�븯�뀛�빞�빀�땲�떎)
+ </div>
</div>
<div ng-switch-when="TEL">
<input type="text" class="form-control input-sm"
name="tel"
ng-model="issueCustomField.useValues"
- maxlength="100"
+ maxlength="30"
autocomplete="off"
kr-input
+ ng-pattern="/^\d{2,3}-\d{3,4}-\d{4}$/"
+ placeholder="�뿰�씫泥� �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
<small class="help-block form-text text-danger"
ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
- ng-if="issueAddForm.tel.$error.required"
+ ng-if="issueModifyForm.tel.$error.required"
translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
</small>
+ <div ng-show="issueModifyForm.tel.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
<!-- �떒�씪 ���젆�듃 -->
@@ -339,7 +378,7 @@
</select>
<small class="help-block form-text text-danger"
ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
- ng-if="issueAddForm.singleSelect.$error.required"
+ ng-if="issueModifyForm.singleSelect.$error.required"
translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
</small>
</div>
@@ -357,7 +396,7 @@
ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
<small class="help-block form-text text-danger"
ng-show="issueCustomField.customFieldVo.requiredData == 'Y'"
- ng-if="issueAddForm.multiSelect.$error.required"
+ ng-if="issueModifyForm.multiSelect.$error.required"
translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
</small>
</div>
@@ -422,7 +461,7 @@
autocomplete="off"
ng-model="vm.companyTel"
maxlength="20">
- <div ng-show="issueAddForm.companyTel.$error.pattern" class="help-block form-text text-danger"
+ <div ng-show="issueModifyForm.companyTel.$error.pattern" class="help-block form-text text-danger"
translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
</div>
</div>
@@ -439,7 +478,7 @@
ng-model="vm.companyEmail"
kr-input
ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/">
- <div ng-show="issueAddForm.companyEmail.$error.pattern" class="help-block form-text text-danger"
+ <div ng-show="issueModifyForm.companyEmail.$error.pattern" class="help-block form-text text-danger"
translate="users.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
</div>
@@ -455,7 +494,11 @@
autocomplete="off"
ng-maxlength="200"
ng-model="vm.companyUrl"
+ ng-pattern="/(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/"
maxlength="200">
+ <div ng-show="issueModifyForm.companyUrl.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<div class="col-lg-4">
@@ -550,7 +593,7 @@
autocomplete="off"
ng-model="vm.ispTel"
maxlength="20">
- <div ng-show="issueAddForm.ispTel.$error.pattern" class="help-block form-text text-danger"
+ <div ng-show="issueModifyForm.ispTel.$error.pattern" class="help-block form-text text-danger"
translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
</div>
</div>
@@ -567,7 +610,7 @@
ng-model="vm.ispEmail"
kr-input
ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/">
- <div ng-show="issueAddForm.ispEmail.$error.pattern" class="help-block form-text text-danger"
+ <div ng-show="issueModifyForm.ispEmail.$error.pattern" class="help-block form-text text-danger"
translate="users.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
</div>
@@ -583,7 +626,11 @@
autocomplete="off"
ng-maxlength="200"
ng-model="vm.ispUrl"
+ ng-pattern="/(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/"
maxlength="200">
+ <div ng-show="issueModifyForm.ispUrl.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<div class="col-lg-4">
@@ -679,7 +726,7 @@
autocomplete="off"
ng-model="vm.hostingTel"
maxlength="20">
- <div ng-show="issueAddForm.hostingTel.$error.pattern" class="help-block form-text text-danger"
+ <div ng-show="issueModifyForm.hostingTel.$error.pattern" class="help-block form-text text-danger"
translate="companyField.invalidTelFormat">�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.
</div>
</div>
@@ -696,7 +743,7 @@
ng-model="vm.hostingEmail"
kr-input
ng-pattern="/^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/">
- <div ng-show="issueAddForm.hostingEmail.$error.pattern" class="help-block form-text text-danger"
+ <div ng-show="issueModifyForm.hostingEmail.$error.pattern" class="help-block form-text text-danger"
translate="users.invalidEmailFormat">�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
</div>
@@ -712,7 +759,11 @@
autocomplete="off"
ng-maxlength="200"
ng-model="vm.hostingUrl"
+ ng-pattern="/(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/"
maxlength="200">
+ <div ng-show="issueModifyForm.hostingUrl.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<div class="col-lg-4">
@@ -760,8 +811,8 @@
translate="common.cancel">痍⑥냼</span></button>
<button type="button" class="btn btn-md btn-primary bold"
js-short-cut
- js-short-cut-action="(fn.formCheck(issueAddForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
- ng-disabled="fn.formCheck(issueAddForm.$invalid)"
+ js-short-cut-action="(fn.formCheck(issueModifyForm.$invalid) || $root.spinner) ? null : fn.formSubmit()"
+ ng-disabled="fn.formCheck(issueModifyForm.$invalid)"
ng-click="fn.formSubmit()"><span translate="common.save">���옣</span>
</button>
</div>
--
Gitblit v1.8.0