From 98f5d103033a7495b9d53fbab7c7907742c384b7 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 09 2월 2022 16:36:32 +0900
Subject: [PATCH] - 이슈 상단 전체 검색 이후 전체 이슈 메뉴를 누르면 상세 검색 화면이 사라지는 문제 수정
---
src/main/webapp/scripts/app/common/common.controller.js | 96 ++++++++++++++++++++++++++++++-----------------
1 files changed, 61 insertions(+), 35 deletions(-)
diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js
index f23c5db..701995f 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -6,8 +6,8 @@
function (app, angular) {
app.controller('commonController', ['$scope', '$rootScope', '$log', 'Auth', '$state', 'User', '$resourceProvider', '$uibModal', 'SweetAlert', 'Workspace', '$translate', '$q',
- '$interval', 'IssueSearch', '$filter', 'Notice', 'Project', 'IssueType',
- function ($scope, $rootScope, $log, Auth, $state, User, $resourceProvider, $uibModal, SweetAlert, Workspace, $translate, $q, $interval, IssueSearch, $filter, Notice, Project, IssueType) {
+ '$controller', '$injector', '$interval', 'IssueSearch', '$filter', 'Notice', 'Project', 'IssueType',
+ function ($scope, $rootScope, $log, Auth, $state, User, $resourceProvider, $uibModal, SweetAlert, Workspace, $translate, $q, $controller, $injector, $interval, IssueSearch, $filter, Notice, Project, IssueType) {
$scope.fn = {
logout: logout, // 濡쒓렇�븘�썐
@@ -24,7 +24,8 @@
findIssueList : findIssueList, // �궗�씠�뱶諛� �씠�뒋 紐⑸줉 媛��졇�삤湲�
changeIssueListMenu : changeIssueListMenu,
setLastIssueType : setLastIssueType,
- searchAll : searchAll // �긽�떒 寃��깋
+ searchAll : searchAll, // �긽�떒 寃��깋
+ sendCommonMail : sendCommonMail
};
$scope.vm = {
@@ -36,12 +37,7 @@
}
};
- // session check after route
- $rootScope.$on("$stateChangeStart", function (event, toState, toStateParams) {
- if (!$rootScope.isMainSearch) {
- $scope.vm.searchAll.keyWord = "";
- }
- });
+ angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
// �떆�뒪�뀥�뿉�꽌 �듅�젙 �씠�뒋濡� 諛붾줈 �씠�룞�븷 �닔 �엳�룄濡� �빐以��떎.
$scope.$on("makeIssueSearch", function (event, args) {
@@ -65,15 +61,37 @@
//}
});
+ $rootScope.$on("$stateChangeStart", function (event, toState, toStateParams) {
+ var keyWord = $rootScope.getCookie("searchKeyword");
+
+ if (keyWord == null || keyWord === '') {
+ $scope.vm.searchAll.keyWord = "";
+ }
+ });
+
+ // �씪諛� 硫붿씪 諛쒖넚 (�궗�슜�옄 吏곸젒 �옉�꽦)
+ function sendCommonMail() {
+ $uibModal.open({
+ templateUrl : 'views/issue/issueCommonSendMail.html',
+ size : "md",
+ controller : 'issueCommonSendMailController',
+ backdrop : 'static',
+ resolve : {
+ parameter : {
+ issueId : null,
+ }
+ }
+ });
+ }
+
// 硫붿씤 �긽�떒 寃��깋
function searchAll() {
- $rootScope.isMainSearch = true;
-
- if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") {
- $state.go("issues.list");
+ if ($rootScope.isDefined($scope.vm.searchAll.keyWord)) {
+ $rootScope.setCookie("searchKeyword", $scope.vm.searchAll.keyWord, 60000);
+ moveMenu("issues.list");
+ } else {
+ SweetAlert.warning($filter("translate")("common.alertSystem"), $filter("translate")("issue.pleaseEnterIssueKeyWord"));
}
-
- $scope.$broadcast("searchIssueList", {keyWord: $scope.vm.searchAll.keyWord});
}
function setLastIssueType() {
@@ -91,10 +109,17 @@
function changeIssueListMenu(issueTypeId, changeProject = true) {
$rootScope.issueTypeMenu = null;
- for (var issueType of $rootScope.workIssueTypes) {
- if (issueType.id === issueTypeId) {
- $rootScope.issueTypeMenu = issueType;
- break;
+ $rootScope.allIssueList = false;
+ if (issueTypeId == null) {
+ $rootScope.allIssueList = true;
+ $rootScope.isMainSearch = false; //�긽�꽭寃��깋 �몴�떆
+ moveMenu("issues.list");
+ }else {
+ for (var issueType of $rootScope.workIssueTypes) {
+ if (issueType.id === issueTypeId) {
+ $rootScope.issueTypeMenu = issueType;
+ break;
+ }
}
}
@@ -102,7 +127,7 @@
if (changeProject) {
$rootScope.$broadcast("changedIssueListMenu", $rootScope.issueTypeMenu);
- $rootScope.changeLastProject($rootScope.issueTypeMenu.projectVo.id, false, false);
+ //$rootScope.changeLastProject($rootScope.issueTypeMenu.projectVo.id, false, false);
if ($rootScope.issueTypeMenu != null) {
moveMenu("issues.list");
@@ -281,26 +306,15 @@
if ($rootScope.workIssueTypes != null && $rootScope.workIssueTypes.length > 0) {
$rootScope.workIssueTypes.forEach(function (issueType) {
- var selectIssueTypeId = null;
+ //var selectIssueTypeId = null;
if (issueType.id === $rootScope.user.lastIssueTypeId) {
- selectIssueTypeId = issueType.id;
+ //selectIssueTypeId = issueType.id;
+ $scope.fn.changeIssueListMenu(issueType.id, false);
// �씠�뒋紐⑸줉 �깉濡쒓퀬移� 紐⑸줉 媛깆떊
- $scope.fn.changeIssueListMenu(selectIssueTypeId, true);
- //$scope.fn.changeIssueListMenu(issueType.id, false);
- //$rootScope.$broadcast("getIssueList", {id: selectIssueTypeId})
- //$state.go('dashboards.dashboard');
- }
-
- if (selectIssueTypeId == null) {
- $scope.fn.changeIssueListMenu($rootScope.workIssueTypes[0].id, false);
-
+ $scope.$broadcast("findIssueListOK", { myIssueType : issueType} );
}
});
}
- // ���돩蹂대뱶濡� 媛��뒗�뜲 �봽濡쒖젥�듃瑜� �깮�꽦�븯嫄곕굹 �닔�젙�빐�룄 嫄몃━�뒗 議곌굔�씠�떎.
- // else {
- // $state.go('dashboards.dashboard');
- // }
}
else {
SweetAlert.error($filter("translate")("managementType.failedToIssueTypeList"), result.data.message.message); // "�씠�뒋 �쑀�삎 紐⑸줉 議고쉶 �떎�뙣"
@@ -408,6 +422,18 @@
});
});
+ // �궗�슜�옄 愿�由� - �궗�슜�옄 �벑湲� 蹂�寃� �뻽�쓣 �븣
+ $rootScope.webSocket.client.subscribe('/user/notification/changeUserLevel', function (notification) {
+ SweetAlert.warning($filter("translate")("common.changeUserLevel"), $filter("translate")("common.logoutForLevelChange"));
+ $rootScope.$broadcast("logout");
+ });
+
+ // �궗�슜�옄 愿�由� - �궗�슜�옄 遺��꽌 蹂�寃� �뻽�쓣 �븣
+ $rootScope.webSocket.client.subscribe('/user/notification/changeUserDepartment', function (notification) {
+ SweetAlert.warning($filter("translate")("common.changeUserDepartment"), $filter("translate")("common.logoutForDepartmentChange"));
+ $rootScope.$broadcast("logout");
+ });
+
// 李몄뿬 �뾽臾� 怨듦컙 鍮꾪솢�꽦�솕 �븣由� - �빐�떦 �뾽臾� 怨듦컙瑜� 蹂닿퀬 �엳�쓣 �븣
$rootScope.webSocket.client.subscribe('/user/notification/workspace-disabled', function (notification) {
// edit by zenith at 20200801
--
Gitblit v1.8.0