From 9ff3e8c43d01f758381b4925cff44502f1241750 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 22 12월 2021 14:26:36 +0900
Subject: [PATCH] - 일반 사용자로 검색 기능 제대로 동작안되는 문제 해결 - 이슈 유형에서 사용중인 프로젝트는 삭제 불가 - 이슈 유형에서 프로젝트 검색 시 워크스페이스 관리자는 모든 프로젝트 검색 가능(기존엔 참여하고있는 프로젝트만 검색가능하게되어있었음)
---
src/main/webapp/scripts/app/common/common.controller.js | 37 ++++++++++++-------------------------
1 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js
index c9fa6ee..8642c6f 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -36,13 +36,6 @@
}
};
- // session check after route
- $rootScope.$on("$stateChangeStart", function (event, toState, toStateParams) {
- if (!$rootScope.isMainSearch) {
- $scope.vm.searchAll.keyWord = "";
- }
- });
-
// �떆�뒪�뀥�뿉�꽌 �듅�젙 �씠�뒋濡� 諛붾줈 �씠�룞�븷 �닔 �엳�룄濡� �빐以��떎.
$scope.$on("makeIssueSearch", function (event, args) {
// �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎.
@@ -67,13 +60,15 @@
// 硫붿씤 �긽�떒 寃��깋
function searchAll() {
- $rootScope.isMainSearch = true;
-
- if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") {
- $state.go("issues.list");
+ if ($state.current.name !== "issues.list") {
+ // $state.go("issues.list");
+ var myUrl = window.location.href.split('#/');
+ location.href = myUrl[0] + "#/issues/issueList?keyWord=" + $scope.vm.searchAll.keyWord;
+ } else {
+ $rootScope.$broadcast("searchIssueList", {keyWord: $scope.vm.searchAll.keyWord});
}
-
- $scope.$broadcast("searchIssueList", {keyWord: $scope.vm.searchAll.keyWord});
+ //$scope.vm.searchAll.keyWord = "";
+ //$rootScope.previousGetParams = null;
}
function setLastIssueType() {
@@ -281,23 +276,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);
- // $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); // "�씠�뒋 �쑀�삎 紐⑸줉 議고쉶 �떎�뙣"
--
Gitblit v1.8.0