From da08346c769258b6102cb4fe5348dc164ea2f3f7 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 일, 12 12월 2021 17:40:31 +0900
Subject: [PATCH] - 연관 이슈 추가 안되는 오류 수정 - 연관 이슈 추가 후 목록 안뜨는 문제 수정 - 이슈 목록 트리 구조 보기 기능 추가

---
 src/main/webapp/scripts/app/issue/issueAddRelation.controller.js |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js b/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js
index d2e4567..0109b26 100644
--- a/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddRelation.controller.js
@@ -73,6 +73,7 @@
                     companyManager : "",   // �뾽泥� �떞�떦�옄
                     companyTel : "",  // �뾽泥� �쟾�솕踰덊샇
                     companyEmail : "",  // �뾽泥� �씠硫붿씪
+                    companyUrl : "", // �뾽泥� url
                     companyMemo : "",  // �뾽泥� 鍮꾧퀬
                     ispId : -1, // ISP ID
                     ispName : "", // ISP 紐�
@@ -80,6 +81,7 @@
                     ispManager : "", // ISP �떞�떦�옄
                     ispTel : "", // ISP �쟾�솕踰덊샇
                     ispEmail : "", // ISP �씠硫붿씪
+                    ispUrl : "", // ISP url
                     ispMemo : "", // ISP 鍮꾧퀬
                     hostingId : -1, // �샇�뒪�똿 ID
                     hostingName : "", // �샇�뒪�똿紐� 寃��깋
@@ -87,6 +89,7 @@
                     hostingTel : "", // �샇�뒪�똿 �쟾�솕踰덊샇
                     hostingCode : "", // �샇�뒪�똿 肄붾뱶
                     hostingEmail : "", // �샇�뒪�똿 �씠硫붿씪
+                    hostingUrl : "", // �샇�뒪�똿 url
                     hostingMemo :"", // �샇�뒪�똿 鍮꾧퀬
 
 
@@ -397,6 +400,7 @@
                     $scope.vm.companyManager = result[0].manager;
                     $scope.vm.companyTel = result[0].tel;
                     $scope.vm.companyEmail = result[0].email;
+                    $scope.vm.companyUrl = result[0].url;
                     $scope.vm.companyMemo = result[0].memo;
 
                 });
@@ -409,6 +413,7 @@
                     $scope.vm.ispManager = result[0].manager;
                     $scope.vm.ispTel = result[0].tel;
                     $scope.vm.ispEmail = result[0].email;
+                    $scope.vm.ispUrl = result[0].url;
                     $scope.vm.ispMemo = result[0].memo;
                 });
 
@@ -420,6 +425,7 @@
                     $scope.vm.hostingManager = result[0].manager;
                     $scope.vm.hostingTel = result[0].tel;
                     $scope.vm.hostingEmail = result[0].email;
+                    $scope.vm.hostingUrl = result[0].url;
                     $scope.vm.hostingMemo = result[0].memo;
                 });
 
@@ -435,18 +441,21 @@
                         companyManager : $scope.vm.companyManager,
                         companyTel : $scope.vm.companyTel,
                         companyEmail :$scope.vm.companyEmail,
+                        companyUrl : $scope.vm.companyUrl,
                         companyMemo : $scope.vm.companyMemo,
                         ispName : $scope.vm.ispName,
                         ispCode : $scope.vm.ispCode,
                         ispManager : $scope.vm.ispManager,
                         ispTel : $scope.vm.ispTel,
                         ispEmail : $scope.vm.ispEmail,
+                        ispUrl : $scope.vm.ispUrl,
                         ispMemo : $scope.vm.ispMemo,
                         hostingName : $scope.vm.hostingName,
                         hostingCode : $scope.vm.hostingCode,
                         hostingManager : $scope.vm.hostingManager,
                         hostingTel : $scope.vm.hostingTel,
                         hostingEmail : $scope.vm.hostingEmail,
+                        hostingUrl : $scope.vm.hostingUrl,
                         hostingMemo : $scope.vm.hostingMemo,
 
                         projectId : (function () {   //  �봽濡쒖젥�듃 �븘�씠�뵒
@@ -537,6 +546,7 @@
                                     manager : $scope.vm.companyManager,
                                     tel : $scope.vm.companyTel,
                                     email :$scope.vm.companyEmail,
+                                    url :$scope.vm.companyUrl,
                                     memo : $scope.vm.companyMemo
                                 });
                             }
@@ -557,6 +567,7 @@
                                     manager : $scope.vm.ispManager,
                                     tel : $scope.vm.ispTel,
                                     email :$scope.vm.ispEmail,
+                                    url :$scope.vm.ispUrl,
                                     memo : $scope.vm.ispMemo
                                 });
 
@@ -579,6 +590,7 @@
                                     manager : $scope.vm.hostingManager,
                                     tel : $scope.vm.hostingTel,
                                     email :$scope.vm.hostingEmail,
+                                    url :$scope.vm.hostingUrl,
                                     memo : $scope.vm.hostingMemo
                                 });
                             }
@@ -640,11 +652,10 @@
                             $scope.fn.cancel();
 
                             //  �씠�뒋 �긽�꽭 �솕硫� �슂泥�
-                            // $rootScope.$broadcast("getIssueDetail", {
-                            //     id : parameter.id
-                            // });
-                            $scope.fn.getIssueDetail($rootScope.currentDetailIssueId);
-                            $rootScope.$broadcast("getIssueList");
+                            $rootScope.$broadcast("getIssueDetail", {
+                                id : parameter.id
+                            });
+
                         }
                         else {
                             SweetAlert.error($filter("translate")("issue.failedIssueModify"), result.data.message.message); // �씠�뒋 �닔�젙 �떎�뙣
@@ -665,7 +676,7 @@
                     var contents = {
                         //relationIssueType : $scope.vm.form.relationIssueTypeId,
                         relationIssueType : $scope.vm.relationIssueType.id,
-                        //issueId : $rootScope.currentDetailIssueId,
+                        // issueId : $rootScope.currentDetailIssueId,
                         issueId :  parameter.id,
                         relationIssueId : relId,
                         priorityName : $scope.vm.priorityName
@@ -676,8 +687,10 @@
                         $resourceProvider.getPageContent(0, 10))).then(function (result) {
 
                         if (result.data.message.status === "success") {
-                            // $scope.fn.getIssueDetail();
-                            $scope.fn.getIssueDetail($rootScope.currentDetailIssueId);
+                            //  �씠�뒋 �긽�꽭 �솕硫� �슂泥�
+                            $rootScope.$broadcast("getIssueDetail", {
+                                id : parameter.id
+                            });
                         }
                         else {
                             SweetAlert.error($filter("translate")("issue.failedToIssueAddIssueRelation"), result.data.message.message); // "�뿰愿��씪媛� �깮�꽦 �떎�뙣"

--
Gitblit v1.8.0