From 8e7861e68cfba8f27d413437654f435a22f05cac Mon Sep 17 00:00:00 2001 From: 이민희 <mhlee@maprex.co.kr> Date: 수, 24 11월 2021 09:15:00 +0900 Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa --- src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js | 34 ++++++++++++++-------------------- 1 files changed, 14 insertions(+), 20 deletions(-) diff --git a/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js index 314fc34..e391679 100644 --- a/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js +++ b/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js @@ -23,53 +23,47 @@ // 蹂��닔 紐⑥쓬 $scope.vm = { issueId : "", - issueTableConfigs : [{ - name : $filter("translate")("issue.downIssueTitle"), // - key : "DOWN_ISSUE_TITLE", - width : "width-100-p", - position : 1, - display : true - }, { + issueDownTableConfigs : [{ name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞 key : "PRIORITY", width : "width-80-p", - position : 2, + position : 1, display : true }, { name : $filter("translate")("common.importance"), // 以묒슂�룄 key : "SEVERITY", width : "width-80-p", - position : 3, + position : 2, display : true }, { name : $filter("translate")("issue.issueType"), // �씠�뒋 ���엯 key : "ISSUE_TYPE", width : "width-140-p", - position : 4, + position : 3, display : true }, { name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌 key : "ASSIGNEE_TEAM", width : "width-100-p", - position : 5, + position : 4, display : true }, { name : $filter("translate")("common.register"), // �벑濡앹옄 key : "REGISTER", width : "width-100-p", - position : 6, + position : 5, display : false }, { name : $filter("translate")("common.period"), // 湲곌컙 key : "PERIOD", width : "width-140-p", - position : 7, + position : 6, display : false }, { name : $filter("translate")("common.lastChangeDate"), // 理쒓렐 蹂�寃쎌씪 key : "MODIFY_DATE", width : "width-100-p", - position : 8, + position : 7, display : false }, { }] @@ -91,7 +85,7 @@ var content = { issueId : $rootScope.currentDetailIssueId, - issueTableConfigs : JSON.stringify($scope.vm.issueTableConfigs) + issueTableConfigs : JSON.stringify($scope.vm.issueDownTableConfigs) }; IssueTableConfig.downAdd($resourceProvider.getContent(content, @@ -102,7 +96,7 @@ swal.close(); $scope.fn.cancel(); // 蹂�寃쎈맂 �씠�뒋 �뀒�씠釉� �젙蹂대�� �씠�뒋 紐⑸줉 �뀒�씠釉붿뿉 媛깆떊�븳�떎. - $rootScope.$broadcast("getDownIssueTableConfigs", {}); + $rootScope.$broadcast("getIssueDetail", { id : $rootScope.currentDetailIssueId}); } else { @@ -142,7 +136,7 @@ var deferred = $q.defer(); var content = { issueId : $rootScope.currentDetailIssueId, - issueTableConfigs : JSON.stringify($scope.vm.issueTableConfigs) + issueTableConfigs : JSON.stringify($scope.vm.issueDownTableConfigs) }; IssueTableConfig.downDetail($resourceProvider.getContent(content, @@ -161,7 +155,7 @@ $scope.fn.getCustomFields().then(function (result) { var count = 8; angular.forEach(result, function (customField) { - $scope.vm.issueTableConfigs.push({ + $scope.vm.issueDownTableConfigs.push({ name : customField.name, key : "CUSTOM_FIELD_" + customField.id, width : "width-100-p", @@ -181,8 +175,8 @@ angular.forEach(saveTableConfigs, function (saveTableConfig) { - for (var count in $scope.vm.issueTableConfigs) { - var issueTableConfig = $scope.vm.issueTableConfigs[count]; + for (var count in $scope.vm.issueDownTableConfigs) { + var issueTableConfig = $scope.vm.issueDownTableConfigs[count]; if (issueTableConfig.key === saveTableConfig.key) { issueTableConfig.display = saveTableConfig.display; -- Gitblit v1.8.0