From 4677f35851fd0daed02d12858e71c79056969d68 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 07 12월 2021 11:02:12 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js |   27 +++++++++++----------------
 1 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
index a02727a..e959d60 100644
--- a/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
@@ -8,8 +8,8 @@
         'angular'
     ],
     function (app, angular) {
-        app.controller('issueAddRelationTableConfigController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'SweetAlert', '$timeout', 'IssueTableConfig', 'CustomField', '$q', '$filter',
-            function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, SweetAlert, $timeout, IssueTableConfig, CustomField, $q, $filter) {
+        app.controller('issueAddRelationTableConfigController', ['$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) {
 
 
                 //  �븿�닔 紐⑥쓬
@@ -23,7 +23,7 @@
 
                 //  蹂��닔 紐⑥쓬
                 $scope.vm = {
-                    issueId: "",
+                    issueTypeId: "",
                     issueRelTableConfigs : [{
                         name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞
                         key : "PRIORITY",
@@ -37,34 +37,28 @@
                         position : 2,
                         display : false
                     }, {
-                        name : $filter("translate")("issue.issueType"), // �씠�뒋 ���엯
-                        key : "ISSUE_TYPE",
-                        width : "width-100-p",
-                        position : 3,
-                        display : false
-                    }, {
                         name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
                         key : "ASSIGNEE_TEAM",
                         width : "width-50-p",
-                        position : 4,
+                        position : 3,
                         display : false
                     }, {
                         name : $filter("translate")("common.register"), // �벑濡앹옄
                         key : "REGISTER",
                         width : "width-50-p",
-                        position : 5,
+                        position : 4,
                         display : false
                     }, {
                         name : $filter("translate")("common.period"), // 湲곌컙
                         key : "PERIOD",
                         width : "width-100-p",
-                        position : 6,
+                        position : 5,
                         display : false
                     }, {
                         name : $filter("translate")("common.lastChangeDate"), // 理쒓렐 蹂�寃쎌씪
                         key : "MODIFY_DATE",
                         width : "width-100-p",
-                        position : 7,
+                        position : 6,
                         display : false
                     }, {
                     }]
@@ -85,7 +79,7 @@
                     $rootScope.spinner = true;
 
                     var content = {
-                        issueId : $rootScope.currentDetailIssueId,
+                        issueTypeId : $rootScope.getCurrentIssueTypeId(),
                         issueTableConfigs : JSON.stringify($scope.vm.issueRelTableConfigs)
                     };
 
@@ -139,7 +133,8 @@
 
                     var content = {
                         issueId : $rootScope.currentDetailIssueId,
-                        delValue : $scope.vm.issueRelTableConfigs.splice(7,1),
+                        issueTypeId : $rootScope.getCurrentIssueTypeId(),
+                        delValue : $scope.vm.issueRelTableConfigs.splice(6,1),
                         issueTableConfigs : JSON.stringify($scope.vm.issueRelTableConfigs)
                     };
 
@@ -157,7 +152,7 @@
 
                 //  �궗�슜�옄 �젙�쓽 �븘�뱶瑜� 議고쉶�븳 �썑 �몴�떆�븷 �씠�뒋 �뀒�씠釉� 而щ읆�쓣 以�鍮꾪븳�떎.
                 $scope.fn.getCustomFields().then(function (result) {
-                    var count = 8;
+                    var count = 7;
                     angular.forEach(result, function (customField) {
                         $scope.vm.issueRelTableConfigs.push({
                             name : customField.name,

--
Gitblit v1.8.0