충돌 수정

이민희

2021-12-02 6a72a3edec87cca9996c7ab3be3fd48479881945

 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});
                                }
                            });
                        }