From b7dfb19b01f66a450126debb0590d20f2f71f2cc Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 24 11월 2021 14:34:45 +0900
Subject: [PATCH] 사용자정의필드도 검색 가능하도록 쿼리 수정
---
src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js | 49 ++++++++++++++++++++-----------------------------
1 files changed, 20 insertions(+), 29 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
index cdddd59..b5c23db 100644
--- a/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
@@ -17,65 +17,53 @@
formSubmit : formSubmit, // �뤌 �쟾�넚
formCheck : formCheck, // �뤌 泥댄겕
getCustomFields : getCustomFields, // �궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉�쓣 媛��졇�삩�떎.
- getIssueTableConfigs : getIssueTableConfigs // �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎.
+ getIssueAddTableConfigs : getIssueAddTableConfigs // �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎.
};
// 蹂��닔 紐⑥쓬
$scope.vm = {
issueTableConfigs : [{
- name : $filter("translate")("issue.relationIssueType"), // �뿰愿� �씠�뒋 援щ텇
- key : "RELATION_ISSUE_TYPE",
- width : "width-100-p",
- position : 1,
- display : true
- }, {
- name : $filter("translate")("issue.relationIssueTitle"), // �뿰愿� �씠�뒋 �젣紐�
- key : "RELATION_ISSUE_TITLE",
- width : "width-80-p",
- position : 2,
- display : true
- }, {
- name : $filter("translate")("common.importance"), // �슦�꽑�닚�쐞
+ name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞
key : "PRIORITY",
width : "width-80-p",
- position : 3,
+ position : 1,
display : true
}, {
name : $filter("translate")("common.importance"), // 以묒슂�룄
key : "SEVERITY",
width : "width-80-p",
- position : 4,
+ position : 2,
display : true
}, {
name : $filter("translate")("issue.issueType"), // �씠�뒋 ���엯
key : "ISSUE_TYPE",
width : "width-140-p",
- position : 5,
+ position : 3,
display : true
}, {
- name : $filter("translate")("common.assignee"), // �떞�떦�옄
- key : "ASSIGNEE",
+ name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
+ key : "ASSIGNEE_TEAM",
width : "width-100-p",
- position : 6,
+ position : 4,
display : true
}, {
name : $filter("translate")("common.register"), // �벑濡앹옄
key : "REGISTER",
width : "width-100-p",
- position : 7,
- display : false
+ position : 5,
+ display : true
}, {
name : $filter("translate")("common.period"), // 湲곌컙
key : "PERIOD",
width : "width-140-p",
- position : 8,
- display : false
+ position : 6,
+ display : true
}, {
name : $filter("translate")("common.lastChangeDate"), // 理쒓렐 蹂�寃쎌씪
key : "MODIFY_DATE",
width : "width-100-p",
- position : 9,
- display : false
+ position : 7,
+ display : true
}, {
}]
};
@@ -103,7 +91,10 @@
if (result.data.message.status === "success") {
SweetAlert.success($filter("translate")("issue.completedSavingIssueTable"), $filter("translate")("issue.saveIssueTableSettingsInformation")); // "�씠�뒋 �뀒�씠釉� �꽕�젙 ���옣 �셿猷�", "�씠�뒋 �뀒�씠釉� �꽕�젙 �젙蹂닿� ���옣�릺�뿀�뒿�땲�떎."
+
// 蹂�寃쎈맂 �씠�뒋 �뀒�씠釉� �젙蹂대�� �씠�뒋 紐⑸줉 �뀒�씠釉붿뿉 媛깆떊�븳�떎.
+ swal.close();
+ $scope.fn.cancel();
$rootScope.$broadcast("getIssueTableConfigs", {});
}
else {
@@ -139,7 +130,7 @@
}
// �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎.
- function getIssueTableConfigs() {
+ function getIssueAddTableConfigs() {
var deferred = $q.defer();
IssueTableConfig.detail($resourceProvider.getContent({},
@@ -156,7 +147,7 @@
// �궗�슜�옄 �젙�쓽 �븘�뱶瑜� 議고쉶�븳 �썑 �몴�떆�븷 �씠�뒋 �뀒�씠釉� 而щ읆�쓣 以�鍮꾪븳�떎.
$scope.fn.getCustomFields().then(function (result) {
- var count = 9;
+ var count = 7;
angular.forEach(result, function (customField) {
$scope.vm.issueTableConfigs.push({
name : customField.name,
@@ -170,7 +161,7 @@
});
// �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎.
- $scope.fn.getIssueTableConfigs().then(function (issueTableConfigs) {
+ $scope.fn.getIssueAddTableConfigs().then(function (issueTableConfigs) {
if ($rootScope.isDefined(issueTableConfigs)) {
$rootScope.spinner = true;
--
Gitblit v1.8.0