From debc7d47107b1fc4509593d942d775f4374a3416 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 10 12월 2021 13:29:20 +0900
Subject: [PATCH] 권한 수정 완료

---
 src/main/webapp/scripts/app/common/common.controller.js |   44 +++++++++++++++++++++++++++++---------------
 1 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js
index 1750d6d..611a551 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -27,6 +27,7 @@
                 };
 
                 $scope.vm = {
+                    workProject : -1,
                     message: "",
                     workProjectId : -1
                 };
@@ -49,6 +50,12 @@
                     findAllWorkproject();
                 });
 
+                $scope.$on("changedLastProject", function () {
+                    //if ($rootScope.workProject != null) {
+                        $scope.fn.findIssueList($rootScope.workProject.id);
+                    //}
+                });
+
                 function setLastIssueType() {
                     if (User != null) {
                         User.updateLastIssueType($resourceProvider.getContent(
@@ -62,7 +69,7 @@
                     }
                 }
 
-                function changeIssueListMenu(issueTypeId) {
+                function changeIssueListMenu(issueTypeId, changeProject = true) {
                     $rootScope.issueTypeMenu = null;
                     for (var issueType of $rootScope.workIssueTypes) {
                         if (issueType.id === issueTypeId) {
@@ -72,22 +79,26 @@
                     }
 
                     // sidebar �겢由��떆 �봽濡쒖젥�듃 �븘�씠�뵒 �꽕�젙
-                    $rootScope.changeLastProject($rootScope.issueTypeMenu.projectVo.id);
+                    if (changeProject) {
 
-                    if ($rootScope.issueTypeMenu != null) {
-                        moveMenu("issues.list");
+                        $rootScope.$broadcast("changedIssueListMenu", $rootScope.issueTypeMenu);
+                        $rootScope.changeLastProject($rootScope.issueTypeMenu.projectVo.id, false, false);
+
+                        if ($rootScope.issueTypeMenu != null) {
+                            moveMenu("issues.list");
+                        }
                     }
-
-                    $rootScope.$broadcast("changeIssueListMenu", $rootScope.issueTypeMenu);
+                    //moveMenu("issues.list");
 
                     if ($rootScope.user.lastIssueTypeId !== issueTypeId) {
                         $scope.fn.setLastIssueType(issueTypeId);
                     }
 
+
                 }
 
                 function moveMenu(stateName) {
-                    if ($state.current.name == stateName) {
+                    if ($state.current.name === stateName) {
                         $state.reload();
                     } else {
                         $state.go(stateName);
@@ -228,11 +239,7 @@
                     });
                 }
 
-
                 //  �쁽�옱 �봽濡쒖젥�듃 蹂�寃쎌떆
-                $scope.$on("changeLastProject", function (event, args) {
-                    findIssueList(args.id);
-                });
 
                 // �씠�뒋 �쑀�삎 紐⑸줉 媛��졇�삤湲�
                function findIssueList(projectId) {
@@ -254,16 +261,20 @@
                                    var selectIssueTypeId = null;
                                    if (issueType.id === $rootScope.user.lastIssueTypeId) {
                                        selectIssueTypeId = issueType.id;
-                                       $scope.fn.changeIssueListMenu(issueType.id);
+                                       $scope.fn.changeIssueListMenu(issueType.id, false);
+                                       // $state.go('dashboards.dashboard');
                                    }
 
                                    if (selectIssueTypeId == null) {
-                                       $scope.fn.changeIssueListMenu($rootScope.workIssueTypes[0].id);
+                                       $scope.fn.changeIssueListMenu($rootScope.workIssueTypes[0].id, false);
+
                                    }
                                });
-                           } else {
-                               $state.go('dashboards.dashboard');
                            }
+                           // ���돩蹂대뱶濡� 媛��뒗�뜲 �봽濡쒖젥�듃瑜� �깮�꽦�븯嫄곕굹 �닔�젙�빐�룄 嫄몃━�뒗 議곌굔�씠�떎.
+                           // else {
+                           //     $state.go('dashboards.dashboard');
+                           // }
                        }
                        else {
                            SweetAlert.error($filter("translate")("managementType.failedToIssueTypeList"), result.data.message.message); // "�씠�뒋 �쑀�삎 紐⑸줉 議고쉶 �떎�뙣"
@@ -276,6 +287,8 @@
                 // �봽濡쒖젥�듃 蹂�寃�
                 function changeLastProject(projectId) {
                    $rootScope.changeLastProject(projectId);
+
+
                 }
 
                 //  �뾽臾� 怨듦컙 蹂�寃�
@@ -455,6 +468,7 @@
                     $scope.fn.findAllWorkproject();
                 });
 
+
                 //  10珥덈쭏�떎 �쎒 �냼耳� �뿰寃곗쓣 �솗�씤�븯�뒗 �뤃留� �씠踰ㅽ듃
                 $interval(function () {
                     //$log.debug("10珥덈쭏�떎 �냼耳� �뿰寃곗쓣 �솗�씤�빀�땲�떎.");

--
Gitblit v1.8.0