From d888528b8472fc67f966b48359879dcd6bcd01ff Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 20 1월 2022 17:48:30 +0900
Subject: [PATCH] - 업체메일 발송 시 파트너의 메일주소가 없을 경우 필터링 해주기 - 전체 프로젝트로 선택 되어있는 경우에도 이슈 만들때 이슈타입과 프로젝트가 선택되도록 수정
---
src/main/webapp/views/issue/issueSendMailPartners.html | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/views/issue/issueSendMailPartners.html b/src/main/webapp/views/issue/issueSendMailPartners.html
index 40eb4af..3bd9bc3 100644
--- a/src/main/webapp/views/issue/issueSendMailPartners.html
+++ b/src/main/webapp/views/issue/issueSendMailPartners.html
@@ -11,35 +11,38 @@
<div class="modal-body">
<form role="form" name="issueSendForm">
<div class="form-group">
- <small translate="issue.sendIssueSelectedUsers">�봽濡쒖젥�듃�뿉 李몄뿬�븯怨� �엳�뒗 �떎瑜� �궗�슜�옄�뿉寃� �씠�뒋 �젙蹂대�� 蹂대깄�땲�떎.</small>
+ <div ng-if="vm.form.account[0].account.length < 1" class="help-block form-text text-danger"
+ translate="issue.sendIssueSelectedNotPartners">�빐�떦 �씠�뒋�뿉 �냽�빐 �엳�뒗 �뙆�듃�꼫 �떞�떦�옄媛� �뾾�뒿�땲�떎.</div>
+ <small ng-if="vm.form.account[0].account.length > 0" translate="issue.sendIssueSelectedPartners">�빐�떦 �씠�뒋�뿉 �냽�빐 �엳�뒗 �뙆�듃�꼫 �떞�떦�옄�뿉寃� �씠�뒋 �젙蹂대�� 蹂대깄�땲�떎.</small>
<div class="select3-selection__choicediv">
- <span class="select3-selection__choice" ng-repeat="user in vm.form.mailUsers">
- <span>{{user.name}}({{user.account}})</span>
+ <span class="select3-selection__choice" ng-repeat="user in vm.form.account[0].account track by $index">
+ <span>{{vm.form.account[0].name[$index]}}({{user}})</span>
<span class="select3-selection__choice__remove"
ng-click="fn.removeMailTarget($index)">횞</span>
</span>
</div>
- <label class="issue-label mt-10">
+ <!--<label class="issue-label mt-10">
<span translate="issue.selectPartners">�뾽泥� �꽑�깮</span> <code class="highlighter-rouge">*</code>
</label>
<js-input-autocomplete data-input-name="mailUsers"
owl-auto-focus
target=".auto-complete-i0nput"
- selected-model="vm.form.mailUsers"
+ selected-model="vm.form.account[0].account"
custom-input="true"
search="vm.userName"
page="vm.autoCompletePage.user.page"
total-page="vm.autoCompletePage.user.totalPage"
- source="fn.getMailTargetAll(vm.form.mailUsers)"
+ source="fn.getMailTargetAll(vm.form.account[0])"
translation-texts="{ empty : 'common.emptyCompanyPartners'}"
- input-disabled="vm.form.mailUsers == null"
+ input-disabled="vm.form.account[0].account == null"
+ broad-cast="getMailTarget"
extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : 'profile',
- type : 'partner', maxlength : 100, autoResize : true, stopRemoveBodyEvent : true }"></js-input-autocomplete>
+ type : 'partner', maxlength : 100, autoResize : true, stopRemoveBodyEvent : true }"></js-input-autocomplete>-->
<div class="form-group mb10 mt-20">
<label for="emailTemplateForm" class="issue-label">
- <span translate="issue.partners">�뾽泥� �씠硫붿씪</span> <code class="highlighter-rouge">*</code>
+ <span translate="issue.selectTemplate">�뀥�뵆由� �꽑�깮</span> <code class="highlighter-rouge">*</code>
</label>
<select id="emailTemplateForm"
name="emailTemplate"
--
Gitblit v1.8.0