From a72bda0256b8a5f3bc348142449e759cd445560b Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 14 12월 2021 17:53:56 +0900
Subject: [PATCH] 이슈 수정시 사용자가 담당부서에 속해있으면 수정 가능
---
src/main/webapp/scripts/app/issue/issueList.controller.js | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index ca0df09..8af4fe4 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -90,7 +90,8 @@
issueTableConfigs : [], // �씠�뒋 �뀒�씠釉� �꽕�젙
issueTreeConfigs : [], // �씠�뒋 �뀒�씠釉� �꽕�젙
parentIssueId : "",
- hideIssue : false,
+ hideCompleteIssue : false,
+ hideDownIssue : true,
listMode : 0, // 紐⑸줉 紐⑤뱶 0:湲곕낯 由ъ뒪�듃 1:�듃由ш뎄議� 由ъ뒪�듃
};
@@ -119,7 +120,6 @@
$scope.$on("searchIssueList", function (event, args) {
$scope.vm.search.keyWord = args.keyWord;
$scope.fn.getPageList(0);
- $rootScope.isMainSearch = false;
});
// 寃��깋 議곌굔�쓣 湲곗뼲�븳�떎. - �쟻�슜 蹂대쪟
@@ -441,7 +441,8 @@
endStartDate : "",
beginCompleteDate : "",
endCompleteDate : "",
- hideIssue : $scope.vm.hideIssue,
+ hideCompleteIssue: $scope.vm.hideCompleteIssue,
+ hideDownIssue : $scope.vm.hideDownIssue,
isTree : $scope.vm.listMode === 1,
projectIds : (function () {
var projectIds = [];
@@ -574,8 +575,12 @@
selectedPage = 0;
}
- if ($scope.vm.hideIssue) {
- $scope.vm.hideIssue = true;
+ if ($scope.vm.hideCompleteIssue) {
+ $scope.vm.hideCompleteIssue = true;
+ }
+
+ if ($scope.vm.hideDownIssue) {
+ $scope.vm.hideDownIssue = true;
}
// �쁽�옱 �럹�씠吏� �젙蹂�
var currentPage = 0;
@@ -624,9 +629,16 @@
if (result.data.message.status === "success") {
if (result.data.data != null && result.data.data.length > 0) {
+ //var resultSize = result.data.data.length;
for (var i = 0; i < result.data.data.length; i++) {
- if (result.data.data[i].parentIssueId != null) {
+ /*if (result.data.data[i].parentIssueId != null) {//�븯�쐞�씠�뒋�뒗 由ъ뒪�듃�뿉�꽌 �궘�젣
result.data.data.splice(i, 1);
+ i--;
+ }else*/
+ if ($scope.vm.search.issueTypeIds !== null && $scope.vm.search.issueTypeIds.length > 0
+ && result.data.data[i].issueTypeId !== $scope.vm.search.issueTypeIds[0].fieldKey) { //�씠�뒋���엯 泥댄겕
+ result.data.data.splice(i, 1);
+ i--;
}
}
}
--
Gitblit v1.8.0