From b4a3d2e4dca6417f7891179808773d62202ddeba Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 일, 12 12월 2021 22:17:56 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/common/common.controller.js | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js
index 4216e9c..4c12bea 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -23,13 +23,17 @@
moveMenu : moveMenu,
findIssueList : findIssueList, // �궗�씠�뱶諛� �씠�뒋 紐⑸줉 媛��졇�삤湲�
changeIssueListMenu : changeIssueListMenu,
- setLastIssueType : setLastIssueType
+ setLastIssueType : setLastIssueType,
+ searchAll : searchAll // �긽�떒 寃��깋
};
$scope.vm = {
workProject : -1,
message: "",
- workProjectId : -1
+ workProjectId : -1,
+ searchAll : {
+ keyWord : ""
+ }
};
@@ -37,7 +41,7 @@
// �떆�뒪�뀥�뿉�꽌 �듅�젙 �씠�뒋濡� 諛붾줈 �씠�룞�븷 �닔 �엳�룄濡� �빐以��떎.
$scope.$on("makeIssueSearch", function (event, args) {
// �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎.
- $scope.fn.makeIssueSearch(args.projectKey, args.issueNumber);
+ $scope.fn.makeIssueSearch(args.projectKey, args.issueNumber, args.issueTypeId);
});
// �씠�뒋 �쑀�삎 蹂�寃쎌떆
@@ -51,10 +55,21 @@
});
$scope.$on("changedLastProject", function () {
- if ($rootScope.workProject != null) {
+ //if ($rootScope.workProject != null) {
$scope.fn.findIssueList($rootScope.workProject.id);
- }
+ //}
});
+
+ // 硫붿씤 �긽�떒 寃��깋
+ function searchAll() {
+ $rootScope.isMainSearch = true;
+
+ if ($state.current.name !== "issues.list" || $state.current.name === "issues.list") {
+ $state.go("issues.list");
+ }
+
+ $scope.$broadcast("searchIssueList", {keyWord: $scope.vm.searchAll.keyWord});
+ }
function setLastIssueType() {
if (User != null) {
@@ -80,6 +95,8 @@
// sidebar �겢由��떆 �봽濡쒖젥�듃 �븘�씠�뵒 �꽕�젙
if (changeProject) {
+
+ $rootScope.$broadcast("changedIssueListMenu", $rootScope.issueTypeMenu);
$rootScope.changeLastProject($rootScope.issueTypeMenu.projectVo.id, false, false);
if ($rootScope.issueTypeMenu != null) {
@@ -87,11 +104,11 @@
}
}
//moveMenu("issues.list");
- //$rootScope.$broadcast("changeIssueListMenu", $rootScope.issueTypeMenu);
if ($rootScope.user.lastIssueTypeId !== issueTypeId) {
$scope.fn.setLastIssueType(issueTypeId);
}
+
}
@@ -116,7 +133,7 @@
}
// �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎.
- function makeIssueSearch(projectKey, issueNumber) {
+ function makeIssueSearch(projectKey, issueNumber, issueTypeId) {
var combinationIssueNumber = projectKey;
if (issueNumber != undefined) {
combinationIssueNumber += "-" + issueNumber;
@@ -134,6 +151,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); // "寃��깋 �븘�뱶 議곌굔 ���옣 �떎�뙣"
@@ -260,7 +278,7 @@
if (issueType.id === $rootScope.user.lastIssueTypeId) {
selectIssueTypeId = issueType.id;
$scope.fn.changeIssueListMenu(issueType.id, false);
- $state.go('dashboards.dashboard');
+ // $state.go('dashboards.dashboard');
}
if (selectIssueTypeId == null) {
--
Gitblit v1.8.0