From 6587fd584cb672bbb8a4539cdc1c5714efb8b48f Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 화, 14 12월 2021 17:54:12 +0900 Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa --- src/main/webapp/scripts/config.js | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/scripts/config.js b/src/main/webapp/scripts/config.js index 29595a6..e2ad463 100644 --- a/src/main/webapp/scripts/config.js +++ b/src/main/webapp/scripts/config.js @@ -67,6 +67,9 @@ // 理쒓퀬愿�由ъ옄 議댁옱 �뿬遺� $rootScope.hasSuperUser = false; + // 硫붿씤 寃��깋 �뿬遺� + $rootScope.isMainSearch = false; + // ���떆蹂대뱶 �꽑�깮 0:�쟾泥� 1:�봽濡쒖젥�듃 $rootScope.dashboard = 0; @@ -348,12 +351,12 @@ $rootScope.$broadcast("changedLastProject", {id: el.id}); $state.go("issues.list"); } - /*if (reload) { + if (reload) { $state.go('dashboards.dashboard'); - }*/ + } } }); - //$state.go($state.current, {}, {reload: reload}); + // $state.go($state.current, {}, {reload: reload}); } }); } @@ -500,6 +503,11 @@ $("#page-container").trigger("click"); $("body").unbind("click"); + // �씠�뒋 寃��깋 �럹�씠吏��뿉�꽌 踰쀬뼱�궇 寃쎌슦 泥섎━ + if ($rootScope.isMainSearch) { + $rootScope.isMainSearch = false; + } + var $uibModalStack = $injector.get('$uibModalStack'); $uibModalStack.dismissAll(); -- Gitblit v1.8.0