From 813a0495502daa59e5c78ecffb66db48d4cf9720 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 20 12월 2021 18:30:00 +0900
Subject: [PATCH] 이슈리스트 새로고침 수정
---
src/main/webapp/scripts/app/issue/issueManager.controller.js | 7 +++++++
src/main/webapp/scripts/app/common/common.controller.js | 15 ++-------------
src/main/webapp/scripts/app/issue/issueList.controller.js | 13 +++++++++++++
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 4 ++--
4 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
index 45accfa..13484af 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -153,9 +153,9 @@
makeTag += "<ul class='ul-not-comma'>";
if(scope.data.departmentVos != null && scope.data.departmentVos.length == 0){ //�냽�빐�엳�뒗 遺��꽌媛� �뾾�쓣 寃쎌슦
- makeTag += "<div style='cursor: pointer; color: #0066ff'' ng-click='event.modifyUserDepartments(data.id, data.userId)'>遺��꽌瑜� �꽑�깮�빐 二쇱꽭�슂.</div>";
+ makeTag += "<div style='cursor: pointer; color: #0066ff' ng-click='event.modifyUserDepartments(data.id, data.userId)'>遺��꽌瑜� �꽑�깮�빐 二쇱꽭�슂.</div>";
}else{
- makeTag += "<div style='cursor: pointer; color: #0066ff'' ng-click='event.modifyUserDepartments(data.id, data.userId)'>";
+ makeTag += "<div style='cursor: pointer; color: #0066ff' ng-click='event.modifyUserDepartments(data.id, data.userId)'>";
angular.forEach(scope.data.departmentVos, function (departments) {
makeTag += "<li>" + departments.departmentName + "</li>";
});
diff --git a/src/main/webapp/scripts/app/common/common.controller.js b/src/main/webapp/scripts/app/common/common.controller.js
index f23c5db..3308457 100644
--- a/src/main/webapp/scripts/app/common/common.controller.js
+++ b/src/main/webapp/scripts/app/common/common.controller.js
@@ -284,23 +284,12 @@
var selectIssueTypeId = null;
if (issueType.id === $rootScope.user.lastIssueTypeId) {
selectIssueTypeId = issueType.id;
+ $scope.fn.changeIssueListMenu(issueType.id, false);
// �씠�뒋紐⑸줉 �깉濡쒓퀬移� 紐⑸줉 媛깆떊
- $scope.fn.changeIssueListMenu(selectIssueTypeId, true);
- //$scope.fn.changeIssueListMenu(issueType.id, false);
- //$rootScope.$broadcast("getIssueList", {id: selectIssueTypeId})
- //$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); // "�씠�뒋 �쑀�삎 紐⑸줉 議고쉶 �떎�뙣"
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 62648a8..d7d74e8 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -104,6 +104,13 @@
angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
+ // �씠�뒋紐⑸줉 �깉濡쒓퀬移� 紐⑸줉 媛깆떊
+ $scope.$on("findIssueListOK", function (event, args) {
+ if (args != null) {
+ $scope.fn.startExecute();
+ }
+ });
+
// �씠�뒋 紐⑸줉 �뜲�씠�꽣 媛깆떊
$scope.$on("getIssueList", function () {
$scope.fn.getPageList($scope.vm.page.selectedPage - 1);
@@ -1278,6 +1285,12 @@
});
}
+ // this.router.navigate(['path/to'])
+ // .then(() => {
+ // window.location.reload();
+ // });
+
+
$scope.fn.startExecute();
}
diff --git a/src/main/webapp/scripts/app/issue/issueManager.controller.js b/src/main/webapp/scripts/app/issue/issueManager.controller.js
index d0afd32..ca7cac7 100644
--- a/src/main/webapp/scripts/app/issue/issueManager.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueManager.controller.js
@@ -39,6 +39,13 @@
}
});
+ // �씠�뒋紐⑸줉 �깉濡쒓퀬移� 紐⑸줉 媛깆떊
+ $scope.$on("findIssueListOK", function (event, args) {
+ if (args != null) {
+ $scope.vm.pageTitle = args.myIssueType.name;
+ }
+ });
+
// �긽�떒 寃��깋�떆
$scope.$on("searchIssueList", function (event, args) {
$scope.vm.pageTitle = $filter("translate")("issue.searchIssue");
--
Gitblit v1.8.0