From bdb1efdc604fce543e21152b4263a9362f64389f Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 목, 10 3월 2022 15:35:19 +0900
Subject: [PATCH] - api 이슈 추가 시 입력한 ip에 속해있는 업체정보를 가진 이슈의 하위로 입력되도록 수정 - issue_company 테이블에 ip 컬럼 추가 및 이슈 추가/수정 시 ip 대역대 항목 추가
---
src/main/webapp/views/issue/issueModify.html | 74 +++++++++++++++++++++++++++---------
1 files changed, 55 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/views/issue/issueModify.html b/src/main/webapp/views/issue/issueModify.html
index 1510436..50cf7d7 100644
--- a/src/main/webapp/views/issue/issueModify.html
+++ b/src/main/webapp/views/issue/issueModify.html
@@ -39,7 +39,6 @@
source="fn.getProjectList(vm.projectName, vm.form.projects, vm.autoCompletePage.project.page, fn.getProjectListCallBack)"
page="vm.autoCompletePage.project.page"
total-page="vm.autoCompletePage.project.totalPage"
- input-disabled="vm.form.projects != null ? vm.form.projects.length > 0 : false"
translation-texts="{ empty : 'common.emptyProject' }"
extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
@@ -238,7 +237,6 @@
<input type="text" class="form-control input-sm"
name="item_{{$index}}"
ng-model="issueCustomField.useValues"
- maxlength="100"
autocomplete="off"
kr-input
ng-required="issueCustomField.fieldOption == '01' || issueCustomField.customFieldVo.requiredData == 'Y'">
@@ -484,7 +482,7 @@
</div>-->
</div>
</div>
- <div class="col-lg-4">
+ <div class="col-lg-3-2">
<div class="form-group mgb5">
<label for="companyFieldUrlAddForm" class="issue-label"><span translate="companyField.url">url</span></label>
<input id="companyFieldUrlAddForm"
@@ -495,10 +493,48 @@
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"
+ <!--<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-2">
+ <div class="form-group mgb5">
+ <label for="companyFieldIpStartAddForm" class="issue-label"><span translate="companyField.ipRange">ip ���뿭��</span></label>
+ <input id="companyFieldIpStartAddForm"
+ name="ipStart"
+ type="text"
+ class="form-control"
+ 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 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
+ autocomplete="off"
+ ng-model="vm.ipStart"
+ >
+ <div ng-if="issueModifyForm.ipStart.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
+ </div>
+ </div>
+ <div class="mt-30">
+ <label class="issue-label">~</label>
+ </div>
+ <div class="col-lg-2 mt-1">
+ <div class="form-group mgb5">
+ <label for="companyFieldIpEndAddForm"></label>
+ <input id="companyFieldIpEndAddForm"
+ name="ipEnd"
+ type="text"
+ class="form-control"
+ 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 二쇱냼 �삎�떇留� �엯�젰 媛��뒫�빀�땲�떎."
+ autocomplete="off"
+ ng-model="vm.ipEnd"
+ >
+ <div ng-if="issueModifyForm.ipEnd.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
</div>
</div>
</div>
@@ -630,25 +666,26 @@
<div class="col-lg-4">
<div class="form-group mb10">
<label class="issue-label"> <span translate="ispField.name">ISP �씠由�</span> </label>
- <input name="ispName"
+ <!--<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"
+ 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)"
page="vm.autoCompletePage.ispField.page"
total-page="vm.autoCompletePage.ispField.totalPage"
input-disabled="false"
+ custom-input="true"
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">
@@ -725,11 +762,10 @@
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"
+ <!--<div ng-show="issueModifyForm.ispUrl.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
- </div>
+ </div>-->
</div>
</div>
<div class="col-lg-4">
@@ -760,15 +796,15 @@
<div class="col-lg-4">
<div class="form-group mb10">
<label class="issue-label"> <span translate="hostingField.name">�샇�뒪�똿 �씠由�</span> </label>
- <input name="hostingName"
+ <!--<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"
+ maxlength="100">-->
+ <js-autocomplete-single data-input-name="hostingField"
selected-model="vm.form.issueHostingFields"
ng-model="vm.hostingName"
search="vm.hostingName"
@@ -776,10 +812,11 @@
page="vm.autoCompletePage.hostingField.page"
total-page="vm.autoCompletePage.hostingField.totalPage"
input-disabled="false"
+ custom-input="true"
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">
@@ -855,11 +892,10 @@
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"
+ <!--<div ng-show="issueModifyForm.hostingUrl.$error.pattern" class="help-block form-text text-danger"
translate="common.invalidUrlFormat">url �삎�떇�씠 留욎� �븡�뒿�땲�떎.
- </div>
+ </div>-->
</div>
</div>
<div class="col-lg-4">
--
Gitblit v1.8.0