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/issueAddDown.html | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/views/issue/issueAddDown.html b/src/main/webapp/views/issue/issueAddDown.html
index b54842c..9b41029 100644
--- a/src/main/webapp/views/issue/issueAddDown.html
+++ b/src/main/webapp/views/issue/issueAddDown.html
@@ -34,7 +34,7 @@
<div class="form-group mb10">
<label class="issue-label"> <span translate="common.project">�봽濡쒖젥�듃</span> <code
class="highlighter-rouge">*</code></label>
- <js-autocomplete-single data-input-name="project"
+ <!--<js-autocomplete-single data-input-name="project"
selected-model="vm.form.projects"
search="vm.projectName"
source="fn.getProjectList(vm.projectName, vm.form.projects, vm.autoCompletePage.project.page, fn.getProjectListCallBack)"
@@ -42,7 +42,17 @@
total-page="vm.autoCompletePage.project.totalPage"
translation-texts="{ empty : 'common.emptyProject' }"
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>-->
+ <select id="issueAddDownForm6"
+ name="issueType"
+ class="form-control input-sm issue-select-label"
+ ng-model="vm.projectName"
+ required
+ disabled>
+ <option>{{vm.projectName}}</option>
+ </select>
</div>
</div>
@@ -440,7 +450,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"
@@ -457,6 +467,45 @@
</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="issueAddDownForm.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="issueAddDownForm.ipEnd.$error.pattern" class="help-block form-text text-danger"
+ translate="common.invalidipAdressFormat">IP二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.
+ </div>
+ </div>
+ </div>
<div class="col-lg-4">
<div class="form-group mgb5">
<label for="companyFieldDescAddForm" class="issue-label"><span translate="companyField.memo">鍮꾧퀬</span></label>
--
Gitblit v1.8.0