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/issueTypeModify.html | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/views/issueType/issueTypeModify.html b/src/main/webapp/views/issueType/issueTypeModify.html index 53060e2..5600d76 100644 --- a/src/main/webapp/views/issueType/issueTypeModify.html +++ b/src/main/webapp/views/issueType/issueTypeModify.html @@ -22,12 +22,12 @@ ng-model="vm.form.name" ng-maxlength="15" maxlength="15" - input-regex="[^a-zA-Z0-9 媛�-�옡�꽦-�뀕�뀖-�뀭\u318D\u119E\u11A2\u2022\u2025a\u00B7\uFE55]" + input-regex="/[^?a-zA-Z0-9/]/" required> <small ng-show="issueTypeModifyForm.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"> @@ -68,22 +68,28 @@ <js-autocomplete-multi data-input-name="departments" selected-model="vm.form.companies" search="vm.companyName" - source="fn.getCompanyList(vm.companyName, vm.form.companies)" + source="fn.getPartnerList(vm.companyName, vm.form.companies)" input-disabled="false" - translation-texts="{ count : 'common.userNum', empty : 'common.emptyUser' }" + 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.removeUseCompany($index)">횞</span> + <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"> <label for="issueTypeModifyForm2"><span translate="common.color">�깋�긽</span> <code class="highlighter-rouge">*</code></label> -- Gitblit v1.8.0