From 5aeb1fd2d825392fb0b2ac00e6edf16a2cdbc5b7 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 13 12월 2021 14:53:07 +0900
Subject: [PATCH] 이슈 검색시 하위 이슈도 검색되는 오류수정
---
src/main/webapp/scripts/app/issue/issueList.controller.js | 191 ++++++++++++++++++++++-------------------------
1 files changed, 90 insertions(+), 101 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 265a815..ca0df09 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -41,7 +41,8 @@
getIssueTableConfigs : getIssueTableConfigs, // �궗�슜�옄 �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 媛믪쓣 媛��졇���꽌 �쟻�슜�븳�떎.
startExecute : startExecute, // 而⑦듃濡� 濡쒕뵫�떆 泥섏쓬�쑝濡� �떆�옉�릺�뒗 �븿�닔
getResponseData : getResponseData, // 而⑦듃濡� 濡쒕뵫�떆 泥섏쓬�쑝濡� �떆�옉�릺�뒗 �븿�닔
- onClickListMode : onClickListMode // 由ъ뒪�듃 紐⑤뱶 蹂�寃쎌떆 �떎�뻾�릺�뒗 �븿�닔
+ onClickListMode : onClickListMode, // 由ъ뒪�듃 紐⑤뱶 蹂�寃쎌떆 �떎�뻾�릺�뒗 �븿�닔
+ setDefaultTableConfig : setDefaultTableConfig // 湲곕낯 �뀒�씠釉� �꽕�젙 �꽭�똿
};
// 蹂��닔
@@ -87,6 +88,7 @@
registers : [], // �벑濡앹옄
customFields : [], // �궗�슜�옄 �젙�쓽 �븘�뱶
issueTableConfigs : [], // �씠�뒋 �뀒�씠釉� �꽕�젙
+ issueTreeConfigs : [], // �씠�뒋 �뀒�씠釉� �꽕�젙
parentIssueId : "",
hideIssue : false,
listMode : 0, // 紐⑸줉 紐⑤뱶 0:湲곕낯 由ъ뒪�듃 1:�듃由ш뎄議� 由ъ뒪�듃
@@ -111,6 +113,13 @@
$scope.$on("changedIssueListMenu", function (event, args) {
$scope.fn.getPageList($scope.vm.page.selectedPage - 1);
+ });
+
+ // �긽�떒 寃��깋�떆
+ $scope.$on("searchIssueList", function (event, args) {
+ $scope.vm.search.keyWord = args.keyWord;
+ $scope.fn.getPageList(0);
+ $rootScope.isMainSearch = false;
});
// 寃��깋 議곌굔�쓣 湲곗뼲�븳�떎. - �쟻�슜 蹂대쪟
@@ -201,6 +210,7 @@
// �씠�뒋 �뀒�씠釉� �꽕�젙
function makeTableConfigs() {
$scope.vm.tableConfigs = [];
+ $scope.vm.treeConfigs = [];
$scope.vm.tableConfigs.push($tableProvider.config()
.setDType("checkbox")
@@ -244,81 +254,44 @@
// �듃由� 而щ읆�쓣 留뚮뱾�뼱以��떎.
function setTreeColumn(issueTableConfig) {
-
// �씪諛� 而щ읆
switch(issueTableConfig.key) {
case "ISSUE_TITLE" : // �씠�뒋 �젣紐�
$scope.vm.treeConfigs.push($treeProvider.config()
- .setHName("issue.issueTitle")
- .setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
- .setDRenderer("ISSUE_TITLE"));
+ .setDName("title"));
break;
case "PRIORITY" : // �슦�꽑�닚�쐞
$scope.vm.treeConfigs.push($treeProvider.config()
- .setHName("common.priority")
- .setDName("priorityName")
- .setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
- .setDRenderer("COMMON_PRIORITY"));
+ .setDName("priorityName"));
break;
case "SEVERITY" : // 以묒슂�룄
$scope.vm.treeConfigs.push($treeProvider.config()
- .setHName("common.importance")
- .setDName("severityName")
- .setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
- .setDRenderer("COMMON_SEVERITY"));
+ .setDName("severityName"));
break;
case "ISSUE_TYPE" : // �씠�뒋 ���엯
$scope.vm.treeConfigs.push($treeProvider.config()
- .setHName("issue.issueType")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
.setDName("issueTypeName"));
break;
case "ASSIGNEE_TEAM" : // �떞�떦遺��꽌
$scope.vm.treeConfigs.push($treeProvider.config()
- .setHName("common.assigneeTeam")
- .setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
- .setDRenderer("ISSUE_DEPARTMENT"));
+ .setDName("assigneeTeam"));
break;
case "REGISTER" : // �벑濡앹옄
$scope.vm.treeConfigs.push($treeProvider.config()
- .setHName("common.register")
- .setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
- .setDRenderer("REGISTER"));
+ .setDName("register"));
break;
case "PERIOD" : // 湲곌컙
$scope.vm.treeConfigs.push($treeProvider.config()
- .setHName("common.period")
- .setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
- .setDRenderer("ISSUE_DUE_DATE"));
+ .setDName("period"));
break;
case "MODIFY_DATE" : // 理쒓렐 蹂�寃쎌씪
$scope.vm.treeConfigs.push($treeProvider.config()
- .setHName("common.lastChangeDate")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
.setDName("modifyDate"));
break;
case "COUNT_DOWN_ISSUE" : // �븯�쐞 �씠�뒋 媛쒖닔
$scope.vm.treeConfigs.push($treeProvider.config()
- .setHName("common.countDownIssue")
- .setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
- .setDRenderer("DOWN_ISSUE_COUNT"));
+ .setDName("countDownIssue"));
break;
}
@@ -330,12 +303,9 @@
if (customField.id === Number(issueTableConfig.key.substring(13))) {
$scope.vm.treeConfigs.push($treeProvider.config()
- .setHName(customField.name)
- .setDType("renderer")
- .setHWidth("bold " + issueTableConfig.width)
- .setDAlign("text-center")
- .setColumnHint(customField)
- .setDRenderer("ISSUE_CUSTOM_FIELD_VALUE_VIEW"));
+ .setDType("CUSTOM_FIELD")
+ .setDName(customField.id)
+ .setColumnHint(customField));
break;
}
}
@@ -599,6 +569,7 @@
// �씠�뒋 紐⑸줉�쓣 議고쉶�븳�떎.
function getPageList(selectedPage, detail = false) {
+ $rootScope.spinner = true; // �봽濡쒓렇�옒�뒪 諛�
if (selectedPage < 0) {
selectedPage = 0;
}
@@ -617,26 +588,31 @@
currentPage = selectedPage;
}
- // 硫붾돱�뿉�꽌 �꽑�깮�맂 �씠�뒋 �쑀�삎�쓣 湲곕낯�쑝濡� 異붽�
- if ($rootScope.issueTypeMenu != null) {
- // $scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
- $scope.vm.search.issueTypeIds = [];
- $scope.vm.search.issueTypeIds.push({
- fieldKey : $rootScope.issueTypeMenu.id,
- fieldValue : $rootScope.issueTypeMenu.name
- });
- }
-
- // 寃��깋 議곌굔�쓣 ���옣�븳�떎.
- //$scope.fn.makeVmSearchObject();
- // �쁽�옱 �꽑�깮�맂 �봽濡쒖젥�듃瑜� 寃��깋 湲곕낯�쑝濡� 異붽�
- if ($rootScope.workProject != null && $rootScope.workProject.id > -1) {
- var find = findProjectSearch($rootScope.workProject.id);
- if (!find) {
- $scope.vm.projects = [];
- $scope.vm.projects.push($rootScope.workProject);
+ // 寃��깋 湲곕낯媛� �꽭�똿
+ $scope.vm.search.issueTypeIds = [];
+ $scope.vm.projects = [];
+ if (!$rootScope.isMainSearch) {
+ // 硫붾돱�뿉�꽌 �꽑�깮�맂 �씠�뒋 �쑀�삎�쓣 湲곕낯�쑝濡� 異붽�
+ if ($rootScope.issueTypeMenu != null) {
+ // $scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
+
+ $scope.vm.search.issueTypeIds.push({
+ fieldKey: $rootScope.issueTypeMenu.id,
+ fieldValue: $rootScope.issueTypeMenu.name
+ });
+ }
+
+ // 寃��깋 議곌굔�쓣 ���옣�븳�떎.
+ //$scope.fn.makeVmSearchObject();
+
+ // �쁽�옱 �꽑�깮�맂 �봽濡쒖젥�듃瑜� 寃��깋 湲곕낯�쑝濡� 異붽�
+ if ($rootScope.workProject != null && $rootScope.workProject.id > -1) {
+ var find = findProjectSearch($rootScope.workProject.id);
+ if (!find) {
+ $scope.vm.projects.push($rootScope.workProject);
+ }
}
}
@@ -647,6 +623,14 @@
$resourceProvider.getPageContent(currentPage, $scope.vm.page.selectedPageRowCount))).then(function (result) {
if (result.data.message.status === "success") {
+ if (result.data.data != null && result.data.data.length > 0) {
+ for (var i = 0; i < result.data.data.length; i++) {
+ if (result.data.data[i].parentIssueId != null) {
+ result.data.data.splice(i, 1);
+ }
+ }
+ }
+
if (result.data.data != null && result.data.data.length > 0) {
$scope.vm.issueTypeId = result.data.data[0].issueTypeId;
$scope.vm.projectKey = result.data.data[0].projectKey;
@@ -666,6 +650,7 @@
else {
SweetAlert.error($filter("translate")("issue.failedIssueLookup"), result.data.message.message); // �씠�뒋 議고쉶 �떎�뙣
}
+ $rootScope.spinner = false; // �봽濡쒓렇�옒�뒪 諛�
});
}
@@ -1178,6 +1163,41 @@
}
}
+ function setDefaultTableConfig() {
+ // 理쒖큹 �뾽臾� 怨듦컙�뿉 �뱾�뼱�솕�쓣 寃쎌슦
+ $scope.vm.issueTableConfigs = [{
+ name : $filter("translate")("issue.issueTitle"), // �씠�뒋 �젣紐�
+ key : "ISSUE_TITLE",
+ width : "width-140-p",
+ position : 1,
+ display : true
+ }, {
+ name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞
+ key : "PRIORITY",
+ width : "width-80-p",
+ position : 2,
+ display : true
+ }, {
+ name : $filter("translate")("common.importance"), // 以묒슂�룄
+ key : "SEVERITY",
+ width : "width-80-p",
+ position : 3,
+ display : true
+ }, {
+ name : $filter("translate")("issue.issueType"), // �씠�뒋 ���엯
+ key : "ISSUE_TYPE",
+ width : "width-140-p",
+ position : 4,
+ display : true
+ }, {
+ name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
+ key : "ASSIGNEE_TEAM",
+ width : "width-140-p",
+ position : 5,
+ display : true
+ }];
+ }
+
// 理쒖큹 �떎�뻾
function startExecute() {
// �뙆�씪誘명꽣 �씫湲�
@@ -1214,38 +1234,7 @@
});
}
else {
- // 理쒖큹 �뾽臾� 怨듦컙�뿉 �뱾�뼱�솕�쓣 寃쎌슦
- $scope.vm.issueTableConfigs = [{
- name : $filter("translate")("issue.issueTitle"), // �씠�뒋 �젣紐�
- key : "ISSUE_TITLE",
- width : "width-140-p",
- position : 1,
- display : true
- }, {
- name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞
- key : "PRIORITY",
- width : "width-80-p",
- position : 2,
- display : true
- }, {
- name : $filter("translate")("common.importance"), // 以묒슂�룄
- key : "SEVERITY",
- width : "width-80-p",
- position : 3,
- display : true
- }, {
- name : $filter("translate")("issue.issueType"), // �씠�뒋 ���엯
- key : "ISSUE_TYPE",
- width : "width-140-p",
- position : 4,
- display : true
- }, {
- name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
- key : "ASSIGNEE_TEAM",
- width : "width-140-p",
- position : 5,
- display : true
- }];
+ $scope.fn.setDefaultTableConfig();
}
// �씠�뒋 �뀒�씠釉� �꽕�젙
--
Gitblit v1.8.0