From 4948331b1541793028ec49c10d2892bc74242818 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 09 2월 2022 14:54:00 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.28:9001/r/owl-kisa
---
src/main/webapp/views/issueType/issueTypeAdd.html | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/views/issueType/issueTypeAdd.html b/src/main/webapp/views/issueType/issueTypeAdd.html
index b4896ce..ec42c66 100644
--- a/src/main/webapp/views/issueType/issueTypeAdd.html
+++ b/src/main/webapp/views/issueType/issueTypeAdd.html
@@ -18,7 +18,7 @@
class="form-control"
autofocus
kr-input
- input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]"
+ input-regex="/[^?a-zA-Z0-9/]/"
autocomplete="off"
ng-model="vm.form.name"
ng-maxlength="15"
@@ -27,7 +27,7 @@
<small ng-show="issueTypeAddForm.name.$error.maxlength" class="help-block form-text text-danger" translate="common.upTo15Characters">
理쒕� 15湲��옄源뚯� �엯�젰�븷 �닔 �엳�뒿�땲�떎.
</small>
- <small translate="managementType.limitNameToSpecialCharacters">�씠�뒋 ���엯 紐낆� �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>
+ <!--<small translate="managementType.limitNameToSpecialCharacters">�씠�뒋 ���엯 紐낆� �듅�닔 臾몄옄瑜� �엯�젰�븷 �닔 �뾾�뒿�땲�떎.</small>-->
</div>
<div class="form-group">
@@ -43,6 +43,41 @@
</div>
<div class="form-group">
+ <label class="issue-label"> <span translate="issue.useProjects">�궗�슜 �봽濡쒖젥�듃</span> <code
+ class="highlighter-rouge">*</code></label>
+ <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)"
+ page="vm.autoCompletePage.project.page"
+ total-page="vm.autoCompletePage.project.totalPage"
+ input-disabled="false"
+ required
+ translation-texts="{ empty : 'common.emptyProject' }"
+ extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
+ type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
+ </div>
+
+ <div class="form-group mgb5">
+ <label class="issue-label"> <span translate="issue.companyInfo">�뾽泥�/ISP/�샇�뒪�똿 �젙蹂�</span> </label>
+ <js-autocomplete-multi data-input-name="departments"
+ selected-model="vm.form.companies"
+ search="vm.companyName"
+ source="fn.getPartnerList(vm.companyName, vm.form.companies)"
+ input-disabled="false"
+ translation-texts="{ count : '', empty : 'common.emptyCompanyPartners' }"
+ extra-settings="{ displayProp : 'byName' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>
+
+
+ <div class="select3-selection__choicediv mt-10">
+ <span class="select3-selection__choice" ng-repeat="company in vm.form.companies">
+ <span>{{company.byName}}</span> <!--�궗�슜�옄媛� �냽�빐 �엳�뒗 遺��꽌 �씠由� 異쒕젰-->
+ <span class="select3-selection__choice__remove" ng-click="fn.removeUsePartner($index)">횞</span>
+ </span>
+ </div>
+ </div>
+
+ <div class="form-group">
<label for="issueTypeAddForm2"><span translate="common.color">�깋�긽</span> <code class="highlighter-rouge">*</code></label>
<div class="input-group">
<input id="issueTypeAddForm2"
--
Gitblit v1.8.0