From 988b102742495caf8e347986ab402a7512d6fc17 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 16 12월 2021 18:03:06 +0900
Subject: [PATCH] 이슈목록 - 테이블표시설정에 프로젝트에서 설정한 사용자정의필드만 가져오기

---
 src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
index 0f8743d..8f9eb74 100644
--- a/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
@@ -8,8 +8,8 @@
         'angular'
     ],
     function (app, angular) {
-        app.controller('issueAddTableConfigController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'SweetAlert', '$timeout', 'IssueTableConfig', 'CustomField', '$q', '$filter', 'parameter',
-            function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, SweetAlert, $timeout, IssueTableConfig, CustomField, $q, $filter, parameter) {
+        app.controller('issueAddTableConfigController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'SweetAlert', '$timeout', 'IssueTableConfig', 'IssueTypeCustomField', '$q', '$filter', 'parameter',
+            function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, SweetAlert, $timeout, IssueTableConfig, IssueTypeCustomField, $q, $filter, parameter) {
 
                 //  �븿�닔 紐⑥쓬
                 $scope.fn = {
@@ -26,63 +26,63 @@
                         name : $filter("translate")("issue.issueTitle"), // �씠�뒋 �젣紐�
                         key : "ISSUE_TITLE",
                         width : "width-140-p",
-                        position : 1,
+                        position : 0,
                         display : true,
                         checkboxShow : false
                     }, {
                         name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞
                         key : "PRIORITY",
                         width : "width-80-p",
-                        position : 2,
+                        position : 1,
                         display : true,
                         checkboxShow : true
                     }, {
                         name : $filter("translate")("common.importance"), // 以묒슂�룄
                         key : "SEVERITY",
                         width : "width-80-p",
-                        position : 3,
+                        position : 2,
                         display : true,
                         checkboxShow : true
                     }, {
                         name : $filter("translate")("issue.issueType"), // �씠�뒋 ���엯
                         key : "ISSUE_TYPE",
                         width : "width-140-p",
-                        position : 4,
+                        position : 3,
                         display : true,
                         checkboxShow : true
                     }, {
                         name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
                         key : "ASSIGNEE_TEAM",
                         width : "width-100-p",
-                        position : 5,
+                        position : 4,
                         display : true,
                         checkboxShow : true
                     }, {
                         name : $filter("translate")("common.countDownIssue"), // �븯�쐞�씠�뒋 移댁슫�듃
                         key : "COUNT_DOWN_ISSUE",
                         width : "width-100-p",
-                        position : 6,
+                        position : 5,
                         display : false,
                         checkboxShow : true
                     }, {
                         name : $filter("translate")("common.register"), // �벑濡앹옄
                         key : "REGISTER",
                         width : "width-100-p",
-                        position : 7,
+                        position : 6,
                         display : false,
                         checkboxShow : true
                     }, {
                         name : $filter("translate")("common.period"), // 湲곌컙
                         key : "PERIOD",
                         width : "width-140-p",
-                        position : 8,
+                        position : 7,
                         display : false,
                         checkboxShow : true
                     }, {
                         name : $filter("translate")("common.lastChangeDate"), // 理쒓렐 蹂�寃쎌씪
                         key : "MODIFY_DATE",
                         width : "width-100-p",
-                        position : 9,
+                        position : 8,
                         display : false,
                         checkboxShow : true
                     }, {
@@ -139,7 +139,7 @@
                 function getCustomFields() {
                     var deferred = $q.defer();
 
-                    CustomField.find($resourceProvider.getContent({},
+                    IssueTypeCustomField.findByIssueType($resourceProvider.getContent({issueTypeId : $rootScope.getCurrentIssueTypeId()},
                         $resourceProvider.getPageContent(0, 1000))).then(function (result) {
                         if (result.data.message.status !== "success") {
                             SweetAlert.error($filter("translate")("issue.failedToUserDefinedFieldListLookup"), result.data.message.message); // �궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉 議고쉶 �떎�뙣

--
Gitblit v1.8.0