From 6a72a3edec87cca9996c7ab3be3fd48479881945 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 21:55:28 +0900
Subject: [PATCH] 충돌 수정
---
src/main/webapp/scripts/config.js | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js
index 74ad46c..22a9427 100644
--- a/src/main/webapp/scripts/config.js
+++ b/src/main/webapp/scripts/config.js
@@ -317,7 +317,7 @@
return false;
};
- $rootScope.changeLastProject = function (projectId, reload = true) {
+ $rootScope.changeLastProject = function (projectId, reload = true, onEvent = true) {
if ($rootScope.workProject == null || $rootScope.workProject.id !== projectId ) {
if (User != null) {
User.updateLastProject($resourceProvider.getContent(
@@ -329,11 +329,16 @@
$rootScope.projects.forEach(function (el) {
if (el.id == projectId) {
$rootScope.workProject = el;
+ if (onEvent) {
+ $rootScope.$broadcast("changedLastProject", {id: el.id});
+ }
- $rootScope.$broadcast("changeLastProject", {id: el.id});
+ if (reload) {
+ $state.go('dashboards.dashboard');
+ }
}
});
- $state.go($state.current, {}, {reload: reload});
+ // $state.go($state.current, {}, {reload: reload});
}
});
}
--
Gitblit v1.8.0