From 8c9fe9cf7890c0360672b8cd6924c76f11452006 Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 월, 20 12월 2021 17:00:01 +0900 Subject: [PATCH] - 이슈상세에서 하위이슈 추가 검색시 상위 이슈는 검색 리스트에서 제외 - 이슈상세에서 연관 이슈/하위 이슈 리스트 전체 불러오기(10개이상 스크롤) - 이슈추가,수정 시 파트너 정보 불러오기 수정 - 하위이슈 히스토리 코드 수정 --- src/main/webapp/views/issue/issueSendMailPartners.html | 40 ++++++++++++++++++++++------------------ 1 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/main/webapp/views/issue/issueSendMailPartners.html b/src/main/webapp/views/issue/issueSendMailPartners.html index 7d93196..e82b1c5 100644 --- a/src/main/webapp/views/issue/issueSendMailPartners.html +++ b/src/main/webapp/views/issue/issueSendMailPartners.html @@ -33,19 +33,29 @@ extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : 'profile', type : 'partner', maxlength : 100, autoResize : true, stopRemoveBodyEvent : true }"></js-input-autocomplete> <div class="Template-area mt-20"> - <label class="issue-detail-label">�씠硫붿씪 �뀥�뵆由�</label> - <div class="mt-10"> - <img id="ISSUE_SEND_1" class="TemplateIMG" src="assets/images/image-email.png" ng-click="fn.changeTemplate('ISSUE_SEND_1')"> - <img id="ISSUE_SEND_2" class="TemplateIMG" src="assets/images/image-email.png" ng-click="fn.changeTemplate('ISSUE_SEND_2')"> - <img id="ISSUE_SEND_3" class="TemplateIMG" src="assets/images/image-email.png" ng-click="fn.changeTemplate('ISSUE_SEND_3')"> - <div> - <span class="email_font">�븙�꽦肄붾뱶</span> - <span class="email_font offset-detail-3">�룄硫붿씤</span> - <span class="email_font offset-detail-3">�샇�뒪�똿</span> - </div> - </div> - <input class="btn-toggled btn-primary table-bordered" style="float: left" type="button" value="�뀥�뵆由�" ng-click="fn.showEmailTemplate()"> + <div class="form-group mb10"> + <label for="emailTemplateForm" class="issue-label"> + <span translate="common.emailTemplate">�씠硫붿씪 �뀥�뵆由�</span> + </label> + <select id="emailTemplateForm" + name="emailTemplate" + class="form-control input-sm issue-select-label" + ng-model="vm.emailTemplateId" + ng-change="fn.onChangeEmailTemplate()" + required> + <option ng-repeat="emailTemplate in vm.emailTemplates" + value="{{emailTemplate.id}}" + translate="{{emailTemplate.title}}"> + </option> + </select> + </div> </div> + <summernote + class="summernote" + lang="ko-KR" + config="vm.options" + ng-model="vm.html" + target=".note-editable"></summernote> </div> </form> </div> @@ -59,10 +69,4 @@ ng-click="fn.formSubmit()"><span translate="issue.sendMail">�씠硫붿씪 諛쒖넚</span> </button> </div> - <div> - <img style="height: 24px; width: 250px; display: none; margin: 0 auto;" id="Email-Template1" src="assets/images/domain.png"> - <img style="height: 24px; width: 250px; display: none; margin: 0 auto; margin-top: 50px" id="Email-Template2" src="assets/images/badcode.png"> - <img style="height: 24px; width: 250px; display: none; margin: 0 auto; margin-top: 50px" id="Email-Template3" src="assets/images/hosting.png"> - </div> - <img style="height: 500px; width: 440px; display: none; margin: 0 auto;" class="mt-20 mb-30" id="Email-Template4" src="assets/images/Email.png"> </div> \ No newline at end of file -- Gitblit v1.8.0