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 | 104 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 85 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js
index 3ced6ea..8642c6f 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -22,19 +22,29 @@
sendMessage: sendMessage,
moveMenu : moveMenu,
findIssueList : findIssueList, // �궗�씠�뱶諛� �씠�뒋 紐⑸줉 媛��졇�삤湲�
- changeIssueListMenu : changeIssueListMenu
+ changeIssueListMenu : changeIssueListMenu,
+ setLastIssueType : setLastIssueType,
+ searchAll : searchAll // �긽�떒 寃��깋
};
$scope.vm = {
+ workProject : -1,
message: "",
+ workProjectId : -1,
+ searchAll : {
+ keyWord : ""
+ }
};
-
-
// �떆�뒪�뀥�뿉�꽌 �듅�젙 �씠�뒋濡� 諛붾줈 �씠�룞�븷 �닔 �엳�룄濡� �빐以��떎.
$scope.$on("makeIssueSearch", function (event, args) {
// �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎.
- $scope.fn.makeIssueSearch(args.projectKey, args.issueNumber);
+ $scope.fn.makeIssueSearch(args.projectKey, args.issueNumber, args.issueTypeId);
+ });
+
+ // �씠�뒋 �쑀�삎 蹂�寃쎌떆
+ $scope.$on("modifyIssueType", function (event, args) {
+ findIssueList($rootScope.workProject != null ? $rootScope.workProject.id : null);
});
// �봽濡쒖젥�듃 紐⑸줉 �솕硫� �깉濡� 怨좎묠�떆
@@ -42,7 +52,39 @@
findAllWorkproject();
});
- function changeIssueListMenu(issueTypeId) {
+ $scope.$on("changedLastProject", function () {
+ //if ($rootScope.workProject != null) {
+ $scope.fn.findIssueList($rootScope.workProject.id);
+ //}
+ });
+
+ // 硫붿씤 �긽�떒 寃��깋
+ function searchAll() {
+ 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.vm.searchAll.keyWord = "";
+ //$rootScope.previousGetParams = null;
+ }
+
+ function setLastIssueType() {
+ if (User != null) {
+ User.updateLastIssueType($resourceProvider.getContent(
+ {lastIssueTypeId: $rootScope.getCurrentIssueTypeId()},
+ $resourceProvider.getPageContent(0, 0))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+
+ }
+ });
+ }
+ }
+
+ function changeIssueListMenu(issueTypeId, changeProject = true) {
$rootScope.issueTypeMenu = null;
for (var issueType of $rootScope.workIssueTypes) {
if (issueType.id === issueTypeId) {
@@ -51,15 +93,25 @@
}
}
- if ($rootScope.issueTypeMenu != null) {
- moveMenu("issues.list");
- }
+ // sidebar �겢由��떆 �봽濡쒖젥�듃 �븘�씠�뵒 �꽕�젙
+ if (changeProject) {
- $rootScope.$broadcast("changeIssueListMenu", $rootScope.issueTypeMenu);
+ $rootScope.$broadcast("changedIssueListMenu", $rootScope.issueTypeMenu);
+ $rootScope.changeLastProject($rootScope.issueTypeMenu.projectVo.id, false, false);
+
+ if ($rootScope.issueTypeMenu != null) {
+ moveMenu("issues.list");
+ }
+ }
+ //moveMenu("issues.list");
+
+ if ($rootScope.user.lastIssueTypeId !== issueTypeId) {
+ $scope.fn.setLastIssueType(issueTypeId);
+ }
}
function moveMenu(stateName) {
- if ($state.current.name == stateName) {
+ if ($state.current.name === stateName) {
$state.reload();
} else {
$state.go(stateName);
@@ -79,7 +131,7 @@
}
// �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎.
- function makeIssueSearch(projectKey, issueNumber) {
+ function makeIssueSearch(projectKey, issueNumber, issueTypeId) {
var combinationIssueNumber = projectKey;
if (issueNumber != undefined) {
combinationIssueNumber += "-" + issueNumber;
@@ -97,6 +149,7 @@
$resourceProvider.getPageContent(0, 0))).then(function (result) {
if (result.data.message.status === "success") {
+ $scope.fn.changeIssueListMenu(issueTypeId);
moveMenu("issues.list");
} else {
SweetAlert.error($filter("translate")("issue.failedToSaveFieldConditions"), result.data.message.message); // "寃��깋 �븘�뱶 議곌굔 ���옣 �떎�뙣"
@@ -147,9 +200,9 @@
}
var id = $rootScope.workProject.id === -1 ? null : $rootScope.workProject.id;
- $scope.fn.findIssueList(id);
}
$rootScope.projects = datas;
+ $scope.fn.findIssueList(id);
}
if ($rootScope.user.lastProjectId == null) {
@@ -200,28 +253,37 @@
});
}
-
// �쁽�옱 �봽濡쒖젥�듃 蹂�寃쎌떆
- $scope.$on("changeLastProject", function (event, args) {
- findIssueList(args.id);
- });
// �씠�뒋 �쑀�삎 紐⑸줉 媛��졇�삤湲�
function findIssueList(projectId) {
+
+ if ($rootScope.projects == null || $rootScope.projects.length <= 1)
+ return;
+
// �씠�뒋 ���엯 紐⑸줉 寃��깋 議곌굔�쓣 留뚮뱺�떎.
var conditions = {
projectId : projectId > -1 ? projectId : null,
useProject : true,
deep : "01" // �씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �썙�겕�뵆濡쒖슦 �젙蹂대�� 李얜뒗�떎.
}
-
IssueType.find($resourceProvider.getContent(conditions,
$resourceProvider.getPageContent(0, 100))).then(function (result) {
if (result.data.message.status === "success") {
$rootScope.workIssueTypes = result.data.data;
- if ($rootScope.workIssueTypes != null) {
- changeIssueListMenu($rootScope.workIssueTypes[0].id);
+
+ if ($rootScope.workIssueTypes != null && $rootScope.workIssueTypes.length > 0) {
+ $rootScope.workIssueTypes.forEach(function (issueType) {
+
+ //var selectIssueTypeId = null;
+ if (issueType.id === $rootScope.user.lastIssueTypeId) {
+ //selectIssueTypeId = issueType.id;
+ $scope.fn.changeIssueListMenu(issueType.id, false);
+ // �씠�뒋紐⑸줉 �깉濡쒓퀬移� 紐⑸줉 媛깆떊
+ $scope.$broadcast("findIssueListOK", { myIssueType : issueType} );
+ }
+ });
}
}
else {
@@ -235,6 +297,8 @@
// �봽濡쒖젥�듃 蹂�寃�
function changeLastProject(projectId) {
$rootScope.changeLastProject(projectId);
+
+
}
// �뾽臾� 怨듦컙 蹂�寃�
@@ -245,6 +309,7 @@
if (result.data.message.status === "success") {
$rootScope.user = result.data.data;
+ $rootScope.setCurrentIssueTypeId()
$state.go($state.current, {}, {reload: true});
if ($state.current.name === "dashboards.dashboard") {
@@ -413,6 +478,7 @@
$scope.fn.findAllWorkproject();
});
+
// 10珥덈쭏�떎 �쎒 �냼耳� �뿰寃곗쓣 �솗�씤�븯�뒗 �뤃留� �씠踰ㅽ듃
$interval(function () {
//$log.debug("10珥덈쭏�떎 �냼耳� �뿰寃곗쓣 �솗�씤�빀�땲�떎.");
--
Gitblit v1.8.0