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/issueAddDownTableConfig.controller.js | 41 +++++++++++++++--------------------------
1 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
index 6e0ef2e..9c5ef09 100644
--- a/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
@@ -8,8 +8,8 @@
'angular'
],
function (app, angular) {
- app.controller('issueAddDownTableConfigController', ['$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('issueAddDownTableConfigController', ['$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) {
// �븿�닔 紐⑥쓬
$scope.fn = {
@@ -36,36 +36,36 @@
position : 2,
display : false
}, {
- name : $filter("translate")("issue.issueType"), // �씠�뒋 ���엯
- key : "ISSUE_TYPE",
- width : "width-140-p",
- position : 3,
- display : false
- }, {
name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
key : "ASSIGNEE_TEAM",
width : "width-100-p",
- position : 4,
+ position : 3,
display : false
}, {
name : $filter("translate")("common.register"), // �벑濡앹옄
key : "REGISTER",
width : "width-100-p",
- position : 5,
+ position : 4,
display : false
}, {
name : $filter("translate")("common.period"), // 湲곌컙
key : "PERIOD",
width : "width-140-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
}, {
+ name : $filter("translate")("issue.issueStatus"), // �씠�뒋 �긽�깭
+ key : "ISSUE_DOWN_STATUS_TYPE",
+ width : "width-100-p",
+ position : 7,
+ display : false
+ },{
}]
};
@@ -84,7 +84,7 @@
$rootScope.spinner = true;
var content = {
- issueId : $rootScope.currentDetailIssueId,
+ issueTypeId : $rootScope.getCurrentIssueTypeId(),
issueTableConfigs : JSON.stringify($scope.vm.issueDownTableConfigs)
};
@@ -134,25 +134,14 @@
// �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎.
function getDownIssueTableConfigs() {
var deferred = $q.defer();
+
var content = {
issueId : $rootScope.currentDetailIssueId,
delValue : $scope.vm.issueDownTableConfigs.splice(7,1),
+ issueTypeId : $rootScope.getCurrentIssueTypeId(),
issueTableConfigs : JSON.stringify($scope.vm.issueDownTableConfigs)
};
- // angular.forEach($scope.vm.issueDownTableConfigs, function (delVaue) {
- // if ($scope.vm.issueDownTableConfigs.indexOf(delVaue.name) === "") {
- // $scope.vm.issueDownTableConfigs.splice(delVaue,1);
- // }
- //
- // })
-
- // for (var i = 0; i < $scope.vm.issueDownTableConfigs; i++) {
- // if ($scope.vm.issueDownTableConfigs == "") {
- // $scope.vm.issueDownTableConfigs.splice(i,1);
- // i--;
- // }
- // }
IssueTableConfig.downDetail($resourceProvider.getContent(content,
$resourceProvider.getPageContent(0, 1000))).then(function (result) {
if (result.data.message.status !== "success") {
--
Gitblit v1.8.0