From 5fb1952ae91f1a739803247266e87dbd15ea1f27 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 01 12월 2021 13:23:09 +0900
Subject: [PATCH] 충돌 수정
---
src/main/webapp/scripts/config.js | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js
index d118d3c..74ad46c 100644
--- a/src/main/webapp/scripts/config.js
+++ b/src/main/webapp/scripts/config.js
@@ -318,23 +318,25 @@
};
$rootScope.changeLastProject = function (projectId, reload = true) {
- if (User != null) {
- User.updateLastProject($resourceProvider.getContent(
- {lastProjectId: projectId},
- $resourceProvider.getPageContent(0, 0))).then(function (result) {
+ if ($rootScope.workProject == null || $rootScope.workProject.id !== projectId ) {
+ if (User != null) {
+ User.updateLastProject($resourceProvider.getContent(
+ {lastProjectId: projectId},
+ $resourceProvider.getPageContent(0, 0))).then(function (result) {
- if (result.data.message.status === "success") {
- $rootScope.user = result.data.data;
- $rootScope.projects.forEach(function (el) {
- if (el.id == projectId) {
- $rootScope.workProject = el;
+ if (result.data.message.status === "success") {
+ $rootScope.user = result.data.data;
+ $rootScope.projects.forEach(function (el) {
+ if (el.id == projectId) {
+ $rootScope.workProject = el;
- $rootScope.$broadcast("changeLastProject", { id : el.id });
- }
- });
- $state.go($state.current, {}, {reload: reload});
- }
- });
+ $rootScope.$broadcast("changeLastProject", {id: el.id});
+ }
+ });
+ $state.go($state.current, {}, {reload: reload});
+ }
+ });
+ }
}
};
--
Gitblit v1.8.0