From a7581104b450a18a30e877ebbe331a2ee5f8e21e Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 21 12월 2021 14:03:30 +0900
Subject: [PATCH] - 모든 게시판 최근 게시물이 상단에 보이도록 정렬 - url 항목 정규표현식
---
src/main/webapp/views/hostingField/hostingFieldAdd.html | 4 +
src/main/resources/mybatis/query-template/customField-template.xml | 1
src/main/webapp/views/issue/issueAdd.html | 12 ++++
src/main/resources/mybatis/query-template/companyField-template.xml | 1
src/main/resources/mybatis/query-template/workflow-template.xml | 1
src/main/resources/mybatis/query-template/issueType-template.xml | 1
src/main/webapp/views/ispField/ispFieldAdd.html | 4 +
src/main/webapp/views/ispField/ispFieldModify.html | 4 +
src/main/webapp/views/companyField/companyFieldModify.html | 4 +
src/main/resources/mybatis/query-template/IspField-template.xml | 1
src/main/webapp/views/issue/issueAddDown.html | 12 ++++
src/main/resources/mybatis/query-template/HostingField-template.xml | 1
src/main/webapp/views/issue/issueAddRelation.html | 12 ++++
src/main/webapp/i18n/ko/global.json | 3
src/main/webapp/views/hostingField/hostingFieldModify.html | 4 +
src/main/webapp/views/issue/issueModify.html | 68 +++++++++++++---------
src/main/webapp/views/companyField/companyFieldAdd.html | 4 +
17 files changed, 108 insertions(+), 29 deletions(-)
diff --git a/src/main/resources/mybatis/query-template/HostingField-template.xml b/src/main/resources/mybatis/query-template/HostingField-template.xml
index 4a14e27..a99515b 100644
--- a/src/main/resources/mybatis/query-template/HostingField-template.xml
+++ b/src/main/resources/mybatis/query-template/HostingField-template.xml
@@ -22,6 +22,7 @@
<if test="id != '' and id != null">
AND h.id like CONCAT('%',#{id},'%')
</if>
+ ORDER BY h.id DESC
<if test="pageSize != '' and pageSize != null">
limit #{pageSize} offset #{page};
</if>
diff --git a/src/main/resources/mybatis/query-template/IspField-template.xml b/src/main/resources/mybatis/query-template/IspField-template.xml
index 37afa9e..9799799 100644
--- a/src/main/resources/mybatis/query-template/IspField-template.xml
+++ b/src/main/resources/mybatis/query-template/IspField-template.xml
@@ -22,6 +22,7 @@
<if test="id != '' and id != null">
AND i.id like CONCAT('%',#{id},'%')
</if>
+ ORDER BY i.id DESC
<if test="pageSize != '' and pageSize != null">
limit #{pageSize} offset #{page};
</if>
diff --git a/src/main/resources/mybatis/query-template/companyField-template.xml b/src/main/resources/mybatis/query-template/companyField-template.xml
index e4b8e15..0ee3d09 100644
--- a/src/main/resources/mybatis/query-template/companyField-template.xml
+++ b/src/main/resources/mybatis/query-template/companyField-template.xml
@@ -23,6 +23,7 @@
<if test="id != '' and id != null">
AND cf.id like CONCAT('%',#{id},'%')
</if>
+ ORDER BY cf.id DESC
<if test="pageSize != '' and pageSize != null">
limit #{pageSize} offset #{page};
</if>
diff --git a/src/main/resources/mybatis/query-template/customField-template.xml b/src/main/resources/mybatis/query-template/customField-template.xml
index e3cd4cc..9359d01 100644
--- a/src/main/resources/mybatis/query-template/customField-template.xml
+++ b/src/main/resources/mybatis/query-template/customField-template.xml
@@ -25,6 +25,7 @@
</when>
</choose>
AND ws.id = #{workspaceId}
+ ORDER BY cf.id DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
diff --git a/src/main/resources/mybatis/query-template/issueType-template.xml b/src/main/resources/mybatis/query-template/issueType-template.xml
index b26e4d5..598fed2 100644
--- a/src/main/resources/mybatis/query-template/issueType-template.xml
+++ b/src/main/resources/mybatis/query-template/issueType-template.xml
@@ -25,6 +25,7 @@
AND it.project_id IS NOT NULL
</if>
AND ws.id = #{workspaceId}
+ ORDER BY it.id DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
diff --git a/src/main/resources/mybatis/query-template/workflow-template.xml b/src/main/resources/mybatis/query-template/workflow-template.xml
index 0f33f37..0cff641 100644
--- a/src/main/resources/mybatis/query-template/workflow-template.xml
+++ b/src/main/resources/mybatis/query-template/workflow-template.xml
@@ -16,6 +16,7 @@
AND w.name like CONCAT('%',#{name},'%')
</if>
AND ws.id = #{workspaceId}
+ ORDER BY w.id DESC
<if test="page != null and !page.equals('')">
limit #{pageSize} offset #{page};
</if>
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index 2d9bbd3..451326e 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -863,7 +863,8 @@
"invalidDateFormat": "�궇吏� �삎�떇�씠 留욎� �븡�뒿�땲�떎.(xxxx-xx-xx)",
"invalidEmailFormat": "�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.",
"invalidSiteFormat": "�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http://濡� �떆�옉�븯�뀛�빞�빀�땲�떎)",
- "invalidTelFormat": "�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎(xxx-xxxx-xxxx)."
+ "invalidTelFormat": "�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎(xxx-xxxx-xxxx).",
+ "invalidUrlFormat": "url �삎�떇�씠 留욎� �븡�뒿�땲�떎."
},
"tasks": {
"agileBoardTitle": "移몃컲 蹂대뱶"
diff --git a/src/main/webapp/views/companyField/companyFieldAdd.html b/src/main/webapp/views/companyField/companyFieldAdd.html
index a73a0f8..3f3713f 100644
--- a/src/main/webapp/views/companyField/companyFieldAdd.html
+++ b/src/main/webapp/views/companyField/companyFieldAdd.html
@@ -79,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">
diff --git a/src/main/webapp/views/companyField/companyFieldModify.html b/src/main/webapp/views/companyField/companyFieldModify.html
index d9c912c..b15fbb4 100644
--- a/src/main/webapp/views/companyField/companyFieldModify.html
+++ b/src/main/webapp/views/companyField/companyFieldModify.html
@@ -78,7 +78,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@:%_\+.~#?&//=]*)/"
>
+ <div ng-show="companyFieldModifyForm.url.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<!--<div class="row">
diff --git a/src/main/webapp/views/hostingField/hostingFieldAdd.html b/src/main/webapp/views/hostingField/hostingFieldAdd.html
index c62231d..5e1ea4f 100644
--- a/src/main/webapp/views/hostingField/hostingFieldAdd.html
+++ b/src/main/webapp/views/hostingField/hostingFieldAdd.html
@@ -119,7 +119,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@:%_\+.~#?&//=]*)/"
>
+ <div ng-show="hostingFieldAddForm.url.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<div>
diff --git a/src/main/webapp/views/hostingField/hostingFieldModify.html b/src/main/webapp/views/hostingField/hostingFieldModify.html
index 1c3d192..ef46f19 100644
--- a/src/main/webapp/views/hostingField/hostingFieldModify.html
+++ b/src/main/webapp/views/hostingField/hostingFieldModify.html
@@ -120,7 +120,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@:%_\+.~#?&//=]*)/"
>
+ <div ng-show="ispFieldModifyForm.url.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<div>
diff --git a/src/main/webapp/views/ispField/ispFieldAdd.html b/src/main/webapp/views/ispField/ispFieldAdd.html
index eb15cf6..b856d71 100644
--- a/src/main/webapp/views/ispField/ispFieldAdd.html
+++ b/src/main/webapp/views/ispField/ispFieldAdd.html
@@ -119,7 +119,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@:%_\+.~#?&//=]*)/"
>
+ <div ng-show="ispFieldAddForm.url.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<div>
diff --git a/src/main/webapp/views/ispField/ispFieldModify.html b/src/main/webapp/views/ispField/ispFieldModify.html
index 9910310..f66076b 100644
--- a/src/main/webapp/views/ispField/ispFieldModify.html
+++ b/src/main/webapp/views/ispField/ispFieldModify.html
@@ -120,7 +120,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@:%_\+.~#?&//=]*)/"
>
+ <div ng-show="ispFieldModifyForm.url.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<div>
diff --git a/src/main/webapp/views/issue/issueAdd.html b/src/main/webapp/views/issue/issueAdd.html
index b84d4e3..f1b88c8 100644
--- a/src/main/webapp/views/issue/issueAdd.html
+++ b/src/main/webapp/views/issue/issueAdd.html
@@ -457,7 +457,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="issueAddForm.companyUrl.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<div class="col-lg-4">
@@ -585,7 +589,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="issueAddForm.ispUrl.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<div class="col-lg-4">
@@ -714,7 +722,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="issueAddForm.hostingUrl.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<div class="col-lg-4">
diff --git a/src/main/webapp/views/issue/issueAddDown.html b/src/main/webapp/views/issue/issueAddDown.html
index 1cc0a16..0b3cd3f 100644
--- a/src/main/webapp/views/issue/issueAddDown.html
+++ b/src/main/webapp/views/issue/issueAddDown.html
@@ -454,7 +454,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="issueAddDownForm.companyUrl.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<div class="col-lg-4">
@@ -582,7 +586,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="issueAddDownForm.ispUrl.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<div class="col-lg-4">
@@ -710,7 +718,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="issueAddDownForm.hostingUrl.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<div class="col-lg-4">
diff --git a/src/main/webapp/views/issue/issueAddRelation.html b/src/main/webapp/views/issue/issueAddRelation.html
index c00d990..052c953 100644
--- a/src/main/webapp/views/issue/issueAddRelation.html
+++ b/src/main/webapp/views/issue/issueAddRelation.html
@@ -465,7 +465,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="issueAddRelationForm.companyUrl.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<div class="col-lg-4">
@@ -593,7 +597,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="issueAddRelationForm.ispUrl.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<div class="col-lg-4">
@@ -721,7 +729,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="issueAddRelationForm.hostingUrl.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
</div>
</div>
<div class="col-lg-4">
diff --git a/src/main/webapp/views/issue/issueModify.html b/src/main/webapp/views/issue/issueModify.html
index f7264f5..a41fb5f 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
@@ -244,7 +244,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.input.$error.required"
+ ng-if="issueModifyForm.input.$error.required"
translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄�젙�쓽�븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
</small>
</div>
@@ -259,7 +259,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.number.$error.required"
+ ng-if="issueModifyForm.number.$error.required"
translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
</small>
</div>
@@ -274,7 +274,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>
@@ -289,7 +289,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.ipAddress.$error.required"
+ ng-if="issueModifyForm.ipAddress.$error.required"
translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
</small>
</div>
@@ -304,7 +304,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.site.$error.required"
+ ng-if="issueModifyForm.site.$error.required"
translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
</small>
</div>
@@ -319,7 +319,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.tel.$error.required"
+ ng-if="issueModifyForm.tel.$error.required"
translate="issue.pleaseEnterIssueTypeCustomFields">�빐�떦 �궗�슜�옄 �젙�쓽 �븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.
</small>
</div>
@@ -339,7 +339,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 +357,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 +422,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 +439,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 +455,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 +554,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 +571,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 +587,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 +687,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 +704,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 +720,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 +772,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