From 17cc6df86e0325229ec2b9d561a17bc6b909f4bb Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 24 12월 2021 09:02:46 +0900
Subject: [PATCH] 사용자 정의 필드 필수 항목 표시 변경 수정
---
src/main/webapp/scripts/app/issue/issueList.controller.js | 52 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index ac4cece..d27ae11 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -52,10 +52,11 @@
issueTypeId : "",
partnerVos : "",
search : {
- keyWord : "", // �쟾泥� 寃��깋
+ keyWord : "", // 寃��깋
title : "", // �젣紐�
description : "", // �궡�슜
combinationIssueNumber : "", // �씠�뒋 踰덊샇
+ issueNumber : "",
projectType : "BTS_PROJECT", // �봽濡쒖젥�듃 �쑀�삎
registerDateRange : "", // �벑濡앹씪 湲곌컙 寃��깋
startDateRange : "", // �떆�옉�씪 湲곌컙 寃��깋
@@ -64,6 +65,9 @@
priorityIds : [], // �슦�꽑�닚�쐞 寃��깋
issueStatusIds : [], // �씠�뒋 �긽�깭 寃��깋
issueTypeIds : [] // �씠�뒋 �쑀�삎 寃��깋
+ },
+ searchAll : {
+ keyWord : "", // �쟾泥� 寃��깋
},
searchView : false, // �긽�꽭 寃��깋 議곌굔 �몴�떆 �뿬遺�
detailView : false, // �긽�꽭 紐⑤뱶 蹂�寃� 媛�
@@ -125,11 +129,13 @@
});
$scope.$on("changedIssueListMenu", function (event, args) {
+ $scope.vm.search.keyWord = "";
+ $scope.vm.searchAll.keyWord = "";
$scope.fn.getPageList($scope.vm.page.selectedPage - 1);
});
// �긽�떒 寃��깋�떆
- $rootScope.$on("searchIssueList", function (event, args) {
+ $scope.$on("searchIssueList", function (event, args) {
$scope.vm.search.keyWord = args.keyWord;
$scope.fn.getPageList(0);
});
@@ -332,7 +338,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")
@@ -342,7 +348,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")
@@ -351,7 +357,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")
@@ -360,7 +366,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")
@@ -369,7 +375,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")
@@ -378,7 +384,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")
@@ -387,7 +393,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")
@@ -403,10 +409,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;
}
@@ -421,7 +428,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)
@@ -453,6 +460,7 @@
keyWord : $scope.vm.search.keyWord,
title : $scope.vm.search.title,
description : $scope.vm.search.description,
+ issueNumber : $scope.vm.search.issueNumber,
projectType : $scope.vm.search.projectType,
combinationIssueNumber : $scope.vm.search.combinationIssueNumber.trim(),
beginRegisterDate : "",
@@ -589,10 +597,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) {
@@ -616,7 +628,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;
@@ -637,6 +649,7 @@
$scope.vm.projects.push($rootScope.workProject);
}
}
+ //$scope.vm.searchAll.keyWord = "";
}
// �씠�뒋 寃��깋 議곌굔�쓣 留뚮뱺�떎.
@@ -675,7 +688,6 @@
} else {
$scope.vm.responseData = result.data;
}
-
}
else {
SweetAlert.error($filter("translate")("issue.failedIssueLookup"), result.data.message.message); // �씠�뒋 議고쉶 �떎�뙣
@@ -1252,14 +1264,14 @@
var params = $rootScope.previousGetParams;
if ($rootScope.isDefined(params)) {
// $rootScope.$broadcast("makeIssueSearch", { projectKey : params.projectKey, issueNumber : params.issueNumber });
- // if (params.keyWord != null) {
- // getIssueList(params.keyWord);
- // }else {
+ if (params.keyWord != null) {
+ $scope.vm.searchAll.keyWord = params.keyWord;
+ getPageList(0,false, params.keyWord);
+ }else {
getDetailList(params.projectKey, params.issueNumber);
- //}
- $rootScope.previousGetParams = null;
+ return;
+ }
// $rootScope.issueTypeId = $rootScope.issueTypeMenu.id;
- return;
}
var promises = {
--
Gitblit v1.8.0