From 06e47101db331df85b8b35d22a926d2ce82d4ba9 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 22 12월 2021 09:27:17 +0900
Subject: [PATCH] 프로젝트 내에 이슈유형 없을시 사이드바에 표시
---
src/main/webapp/views/issue/issueModify.html | 100 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 65 insertions(+), 35 deletions(-)
diff --git a/src/main/webapp/views/issue/issueModify.html b/src/main/webapp/views/issue/issueModify.html
index d9d3a1e..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>
@@ -370,7 +370,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>
@@ -421,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>
@@ -438,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>
@@ -454,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">
@@ -476,7 +481,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>
@@ -485,7 +490,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)"
@@ -495,7 +508,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">
@@ -541,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>
@@ -558,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>
@@ -574,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">
@@ -596,7 +613,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>
@@ -605,8 +622,17 @@
<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"
+ ng-model="vm.hostingName"
search="vm.hostingName"
source="fn.getIssueHostingFieldList(vm.hostingName, vm.form.issueHostingFields, vm.autoCompletePage.hostingField.page, fn.getIssueHostingFieldListCallBack)"
page="vm.autoCompletePage.hostingField.page"
@@ -615,7 +641,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">
@@ -661,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>
@@ -678,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>
@@ -694,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">
@@ -742,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