From 6565e26508224b5d1de1ff7cf0f263fe196790e9 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 21 12월 2021 15:54:06 +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 | 18 +++++-------------
1 files changed, 5 insertions(+), 13 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..70f779a 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -73,7 +73,7 @@
$state.go("issues.list");
}
- $scope.$broadcast("searchIssueList", {keyWord: $scope.vm.searchAll.keyWord});
+ $rootScope.$broadcast("searchIssueList", {keyWord: $scope.vm.searchAll.keyWord});
}
function setLastIssueType() {
@@ -281,23 +281,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