From 3ecaff5454a5450ad6c50652e01b7f509cf55eb7 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 20 12월 2021 17:37:54 +0900
Subject: [PATCH] API 토큰 복사 버튼 생성
---
src/main/webapp/scripts/app/common/common.controller.js | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 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 1859208..f23c5db 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -23,16 +23,25 @@
moveMenu : moveMenu,
findIssueList : findIssueList, // �궗�씠�뱶諛� �씠�뒋 紐⑸줉 媛��졇�삤湲�
changeIssueListMenu : changeIssueListMenu,
- setLastIssueType : setLastIssueType
+ setLastIssueType : setLastIssueType,
+ searchAll : searchAll // �긽�떒 寃��깋
};
$scope.vm = {
workProject : -1,
message: "",
- workProjectId : -1
+ workProjectId : -1,
+ searchAll : {
+ keyWord : ""
+ }
};
-
+ // session check after route
+ $rootScope.$on("$stateChangeStart", function (event, toState, toStateParams) {
+ if (!$rootScope.isMainSearch) {
+ $scope.vm.searchAll.keyWord = "";
+ }
+ });
// �떆�뒪�뀥�뿉�꽌 �듅�젙 �씠�뒋濡� 諛붾줈 �씠�룞�븷 �닔 �엳�룄濡� �빐以��떎.
$scope.$on("makeIssueSearch", function (event, args) {
@@ -55,6 +64,17 @@
$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) {
@@ -93,8 +113,6 @@
if ($rootScope.user.lastIssueTypeId !== issueTypeId) {
$scope.fn.setLastIssueType(issueTypeId);
}
-
-
}
function moveMenu(stateName) {
@@ -187,9 +205,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) {
@@ -244,6 +262,10 @@
// �씠�뒋 �쑀�삎 紐⑸줉 媛��졇�삤湲�
function findIssueList(projectId) {
+
+ if ($rootScope.projects == null || $rootScope.projects.length <= 1)
+ return;
+
// �씠�뒋 ���엯 紐⑸줉 寃��깋 議곌굔�쓣 留뚮뱺�떎.
var conditions = {
projectId : projectId > -1 ? projectId : null,
@@ -262,8 +284,11 @@
var selectIssueTypeId = null;
if (issueType.id === $rootScope.user.lastIssueTypeId) {
selectIssueTypeId = issueType.id;
- $scope.fn.changeIssueListMenu(issueType.id, false);
- // $state.go('dashboards.dashboard');
+ // �씠�뒋紐⑸줉 �깉濡쒓퀬移� 紐⑸줉 媛깆떊
+ $scope.fn.changeIssueListMenu(selectIssueTypeId, true);
+ //$scope.fn.changeIssueListMenu(issueType.id, false);
+ //$rootScope.$broadcast("getIssueList", {id: selectIssueTypeId})
+ //$state.go('dashboards.dashboard');
}
if (selectIssueTypeId == null) {
--
Gitblit v1.8.0