From 71b8c61b79be17f9ac886b947051d3256a32f159 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 18 2월 2022 11:14:16 +0900
Subject: [PATCH] 이슈유형 설정에 상위 이슈 업체/ISP/호스팅 상속 기능 추가
---
src/main/webapp/views/issueType/issueTypeAdd.html | 58 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/views/issueType/issueTypeAdd.html b/src/main/webapp/views/issueType/issueTypeAdd.html
index d44c9b6..fac75ef 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,25 +43,47 @@
</div>
<div class="form-group">
- <label><span translate="issue.useProjects">�궗�슜 �봽濡쒖젥�듃</span></label>
- <js-autocomplete-single data-input-name="workflow"
- selected-model="vm.form.workflows"
- search="vm.workflowName"
- source="fn.getWorkflowList(vm.workflowName, vm.form.workflows, vm.autoCompletePage.workflow.page, fn.getWorkflowListCallBack)"
- page="vm.autoCompletePage.workflow.page"
- total-page="vm.autoCompletePage.workflow.totalPage"
+ <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"
- extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '', type : '', maxlength : 200, autoResize : false }"></js-autocomplete-single>
+ 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">
- <label><span
- translate="issue.companyInfo">�뾽泥�/ISP/�샇�뒪�똿 �젙蹂�</span></label>
- <ng-dropdown-multiselect class="multiSelect cursor"
- data-input-name="issueStatusTypes"
- selected-model="vm.search.issueStatusTypes"
- extra-settings="{ stringTypeOption : true }"
- options="vm.options.emailTemplates"></ng-dropdown-multiselect>
+ <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>
+ <span class="issue-label mb-0" translate="issue.inheritPartners">�뙆�듃�꼫 �젙蹂� �긽�냽</span>
+ </div>
+ <div class="form-group mt-5 ml--12">
+ <label class='switch ml-3' style=""><input type='checkbox' ng-model='vm.form.inheritPartners'>
+ <span class='slider round'></span>
+ </label>
</div>
<div class="form-group">
--
Gitblit v1.8.0