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/issue/issueAddRelation.html | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/views/issue/issueAddRelation.html b/src/main/webapp/views/issue/issueAddRelation.html
index 1c58f18..052c953 100644
--- a/src/main/webapp/views/issue/issueAddRelation.html
+++ b/src/main/webapp/views/issue/issueAddRelation.html
@@ -380,7 +380,8 @@
<div ng-show="fn.containsPartner('�뾽泥�')" class="row">
<div class="col-lg-8 fontcolor_green">
<label class="issue-label"><span class="fontcolor_green" translate="companyField.info">�뾽泥댁젙蹂�</span>
- <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> �뾽泥� �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 �뾽泥� �젙蹂닿� 議고쉶�맗�땲�떎.</span>
+ <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code>
+ �뾽泥� �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 �뾽泥� �젙蹂닿� 議고쉶�릺硫�, �뾽泥댁젙蹂댁뿉�꽌 異붽��븳 ISP, �샇�뒪�똿 �젙蹂대�� 遺덈윭�샃�땲�떎.</span>
</label>
</div>
</div>
@@ -464,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">
@@ -486,7 +491,7 @@
<div ng-show="fn.containsPartner('ISP')" class="row">
<div class="col-lg-8 fontcolor_green">
<label class="issue-label"><span class="fontcolor_green" translate="ispField.info">ISP �젙蹂�</span>
- <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> ISP �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 ISP �젙蹂닿� 議고쉶�맗�땲�떎.</span>
+ <!--<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> ISP �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 ISP �젙蹂닿� 議고쉶�맗�땲�떎.</span>-->
</label>
</div>
</div>
@@ -495,7 +500,15 @@
<div class="col-lg-4">
<div class="form-group mb10">
<label class="issue-label"> <span translate="ispField.name">ISP �씠由�</span> </label>
- <js-autocomplete-single data-input-name="ispField"
+ <input name="ispName"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-model="vm.ispName"
+ ng-maxlength="100"
+ maxlength="100">
+ <!--<js-autocomplete-single data-input-name="ispField"
selected-model="vm.form.issueIspFields"
search="vm.ispName"
source="fn.getIssueIspFieldList(vm.ispName, vm.form.issueIspFields, vm.autoCompletePage.ispField.page, fn.getIssueIspFieldListCallBack)"
@@ -505,7 +518,7 @@
translation-texts="{ empty : 'common.emptyIsp' }"
broad-cast="ispFieldEvent"
extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
- type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
+ type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>-->
</div>
</div>
<div class="col-lg-4">
@@ -584,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">
@@ -606,7 +623,7 @@
<div ng-show="fn.containsPartner('�샇�뒪�똿')" class="row">
<div class="col-lg-8 fontcolor_green">
<label class="issue-label"><span class="fontcolor_green" translate="hostingField.info">�샇�뒪�똿 �젙蹂�</span>
- <span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> �샇�뒪�똿 �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 �샇�뒪�똿 �젙蹂닿� 議고쉶�맗�땲�떎.</span>
+ <!--<span class="select3-selection__choice" style="position: relative; bottom: 2px;"><code class="highlighter-rouge">*</code> �샇�뒪�똿 �씠由� �겢由��떆 �꽑�깮�맂 �씠由꾩쓽 �샇�뒪�똿 �젙蹂닿� 議고쉶�맗�땲�떎.</span>-->
</label>
</div>
</div>
@@ -615,7 +632,15 @@
<div class="col-lg-4">
<div class="form-group mb10">
<label class="issue-label"> <span translate="hostingField.name">�샇�뒪�똿 �씠由�</span> </label>
- <js-autocomplete-single data-input-name="hostingField"
+ <input name="hostingName"
+ type="text"
+ class="form-control"
+ kr-input
+ autocomplete="off"
+ ng-model="vm.hostingName"
+ ng-maxlength="100"
+ maxlength="100">
+ <!--<js-autocomplete-single data-input-name="hostingField"
selected-model="vm.form.issueHostingFields"
search="vm.hostingName"
source="fn.getIssueHostingFieldList(vm.hostingName, vm.form.issueHostingFields, vm.autoCompletePage.hostingField.page, fn.getIssueHostingFieldListCallBack)"
@@ -625,7 +650,7 @@
translation-texts="{ empty : 'common.emptyHosting' }"
broad-cast="hostingFieldEvent"
extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
- type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
+ type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>-->
</div>
</div>
<div class="col-lg-4">
@@ -704,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">
--
Gitblit v1.8.0