From 1bf54ac4463cc9a821bb818f6c8cfb01d981e91a Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 23 12월 2021 15:51:29 +0900
Subject: [PATCH] - '이슈관리' 권한은 내가 속해있는 프로젝트의 이슈에 대해서만 관리 권한이 있음 - 일반 사용자 검색 문제 해결 - 이슈리스트 툴팁 재추가
---
src/main/webapp/scripts/app/issue/issueList.controller.js | 48 ++++++++++++++++++++++++++++++------------------
1 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 741a67b..d770571 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -52,7 +52,7 @@
issueTypeId : "",
partnerVos : "",
search : {
- keyWord : "", // �쟾泥� 寃��깋
+ keyWord : "", // 寃��깋
title : "", // �젣紐�
description : "", // �궡�슜
combinationIssueNumber : "", // �씠�뒋 踰덊샇
@@ -65,6 +65,9 @@
priorityIds : [], // �슦�꽑�닚�쐞 寃��깋
issueStatusIds : [], // �씠�뒋 �긽�깭 寃��깋
issueTypeIds : [] // �씠�뒋 �쑀�삎 寃��깋
+ },
+ searchAll : {
+ keyWord : "", // �쟾泥� 寃��깋
},
searchView : false, // �긽�꽭 寃��깋 議곌굔 �몴�떆 �뿬遺�
detailView : false, // �긽�꽭 紐⑤뱶 蹂�寃� 媛�
@@ -130,8 +133,8 @@
});
// �긽�떒 寃��깋�떆
- $scope.$on("searchIssueList", function (event, args) {
- $scope.vm.search.keyWord = args.keyWord;
+ $rootScope.$on("searchIssueList", function (event, args) {
+ $scope.vm.searchAll.keyWord = args.keyWord;
$scope.fn.getPageList(0);
});
@@ -333,7 +336,7 @@
case "ISSUE_TITLE" : // �씠�뒋 �젣紐�
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("issue.issueTitle")
- .setDName("issueTitle")
+ .setDName("issueNumber") /* todo �씠嫄� ���씠��濡� 蹂�寃쏀빐�빞�븯�뒗�뜲*/
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -343,7 +346,7 @@
case "PRIORITY" : // �슦�꽑�닚�쐞
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.priority")
- .setDName("priority")
+ .setDName("priorityId")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -352,7 +355,7 @@
case "SEVERITY" : // 以묒슂�룄
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.importance")
- .setDName("severity")
+ .setDName("severityId")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -361,7 +364,7 @@
case "ISSUE_TYPE" : // �씠�뒋 �쑀�삎
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("issue.issueType")
- .setDName("issueType")
+ .setDName("issueTypeId")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -370,7 +373,7 @@
case "ASSIGNEE_TEAM" : // �떞�떦遺��꽌
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.assigneeTeam")
- .setDName("assigneeTeam")
+ .setDName("departmentName") /* todo 泥댄겕*/
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -379,7 +382,7 @@
case "REGISTER" : // �벑濡앹옄
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.register")
- .setDName("register")
+ .setDName("registerId")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -388,7 +391,7 @@
case "PERIOD" : // 湲곌컙
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.period")
- .setDName("period")
+ .setDName("startDate")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -404,10 +407,11 @@
case "COUNT_DOWN_ISSUE" : // �븯�쐞 �씠�뒋 媛쒖닔
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("common.countDownIssue")
- .setDName("countDownIssue")
+ .setDName("downIssueCount")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
+ .setColumnTooltip("誘몄셿猷� �븯�쐞�씠�뒋/�쟾泥� �븯�쐞�씠�뒋")
.setDRenderer("DOWN_ISSUE_COUNT"));
break;
}
@@ -422,7 +426,7 @@
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName(customField.name)
.setDType("renderer")
- .setDName("customFieldName" + [count])
+ .setDName("useValue" + [count]) /* todo 泥댄겕*/
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setColumnHint(customField)
@@ -591,10 +595,14 @@
}
// �씠�뒋 紐⑸줉�쓣 議고쉶�븳�떎.
- function getPageList(selectedPage, detail = false) {
+ function getPageList(selectedPage, detail = false, keyWord = "") {
$rootScope.spinner = true; // �봽濡쒓렇�옒�뒪 諛�
if (selectedPage < 0) {
selectedPage = 0;
+ }
+
+ if (keyWord !== "") {
+ $scope.vm.search.keyWord = keyWord;
}
if ($scope.vm.hideCompleteIssue) {
@@ -618,7 +626,7 @@
// 寃��깋 湲곕낯媛� �꽭�똿
$scope.vm.search.issueTypeIds = [];
$scope.vm.projects = [];
- if (!$rootScope.isMainSearch) {
+ if ($scope.vm.searchAll.keyWord == null || $scope.vm.searchAll.keyWord === "") {
// 硫붾돱�뿉�꽌 �꽑�깮�맂 �씠�뒋 �쑀�삎�쓣 湲곕낯�쑝濡� 異붽�
if ($rootScope.issueTypeMenu != null) {
//$scope.vm.pageTitle = $rootScope.issueTypeMenu.name;
@@ -639,6 +647,7 @@
$scope.vm.projects.push($rootScope.workProject);
}
}
+ //$scope.vm.searchAll.keyWord = "";
}
// �씠�뒋 寃��깋 議곌굔�쓣 留뚮뱺�떎.
@@ -677,7 +686,6 @@
} else {
$scope.vm.responseData = result.data;
}
-
}
else {
SweetAlert.error($filter("translate")("issue.failedIssueLookup"), result.data.message.message); // �씠�뒋 議고쉶 �떎�뙣
@@ -1254,10 +1262,14 @@
var params = $rootScope.previousGetParams;
if ($rootScope.isDefined(params)) {
// $rootScope.$broadcast("makeIssueSearch", { projectKey : params.projectKey, issueNumber : params.issueNumber });
- getDetailList(params.projectKey, params.issueNumber);
- $rootScope.previousGetParams = null;
+ if (params.keyWord != null) {
+ $scope.vm.searchAll.keyWord = params.keyWord;
+ getPageList(0,false, params.keyWord);
+ }else {
+ getDetailList(params.projectKey, params.issueNumber);
+ return;
+ }
// $rootScope.issueTypeId = $rootScope.issueTypeMenu.id;
- return;
}
var promises = {
--
Gitblit v1.8.0