From 4af75fe18d97960fabea0fadb28a69c01a038bc4 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 25 1월 2022 17:01:37 +0900
Subject: [PATCH] - 파트너명 특수문자 입력 가능하도록 수정 - 이슈 import/export 시 파트너 정보 추가 - 이슈상세 - 메일 기록 추가

---
 src/main/webapp/views/issue/issueExcelImport.html |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/views/issue/issueExcelImport.html b/src/main/webapp/views/issue/issueExcelImport.html
index 4d66c0d..8c32bf1 100644
--- a/src/main/webapp/views/issue/issueExcelImport.html
+++ b/src/main/webapp/views/issue/issueExcelImport.html
@@ -9,11 +9,11 @@
     </div>
 
     <div class="modal-body">
-        <form role="form" name="issueExcelImportFrom">
+        <form role="form" name="issueExcelImportForm">
             <div class="row">
                 <div class="col-lg-5">
                     <div class="form-group">
-                        <label for=""> <span translate="common.project">�봽濡쒖젥�듃</span> <code
+                        <label><span translate="common.project">�봽濡쒖젥�듃</span> <code
                                 class="highlighter-rouge">*</code></label>
                         <js-autocomplete-single data-input-name="project"
                                                 selected-model="vm.form.projects"
@@ -22,14 +22,27 @@
                                                 page="vm.autoCompletePage.project.page"
                                                 total-page="vm.autoCompletePage.project.totalPage"
                                                 input-disabled="false"
+                                                broad-cast="projectListEvent"
                                                 extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
                                                 type : '', maxlength : 200, autoResize : true, stopRemoveBodyEvent : true }"></js-autocomplete-single>
                     </div>
 
-                    <div class="form-group">
-                        <label for="issueExcelImportFrom3"> <span translate="issue.issueType">�씠�뒋 ���엯</span> <code
+                    <label><span translate="issue.parentIssue">�긽�쐞 �씠�뒋</span></label>
+                    <js-autocomplete-single data-input-name="issue"
+                                            selected-model="vm.form.issues"
+                                            search="vm.issueName"
+                                            source="fn.getRelIssueList(vm.issueName, vm.issueTypeId, vm.form.issues, vm.autoCompletePage.issue.page, fn.getIssueListCallBack)"
+                                            page="vm.autoCompletePage.issue.page"
+                                            total-page="vm.autoCompletePage.issue.totalPage"
+                                            input-disabled="false"
+                                            translation-texts="{ empty : 'common.emptyIssue' }"
+                                            extra-settings="{ displayProp : 'title' , idProp : 'id', imageable : false, imagePathProp : '',
+                                            type : '', maxlength : 200, autoResize : true, stopRemoveBodyEvent : true }"></js-autocomplete-single>
+
+                    <div class="form-group mt-5">
+                        <label for="issueExcelImportForm3"> <span translate="issue.issueType">�씠�뒋 ���엯</span> <code
                                 class="highlighter-rouge">*</code></label>
-                        <select id="issueExcelImportFrom3"
+                        <select id="issueExcelImportForm3"
                                 name="issueType"
                                 class="form-control input-sm"
                                 ng-model="vm.form.issueTypeId"

--
Gitblit v1.8.0