From c254ef2ee7121bbea936705e408b5ff671cf4a91 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 07 12월 2021 09:31:34 +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 | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
index eba9b44..8d58039 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 = {
@@ -60,6 +60,12 @@
position : 6,
display : false
}, {
+ name : $filter("translate")("issue.issueStatus"), // �씠�뒋 �긽�깭
+ key : "ISSUE_DOWN_STATUS_TYPE",
+ width : "width-100-p",
+ position : 7,
+ display : false
+ },{
}]
};
@@ -78,7 +84,7 @@
$rootScope.spinner = true;
var content = {
- issueId : $rootScope.currentDetailIssueId,
+ issueTypeId : $rootScope.getCurrentIssueTypeId(),
issueTableConfigs : JSON.stringify($scope.vm.issueDownTableConfigs)
};
@@ -128,25 +134,14 @@
// �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎.
function getDownIssueTableConfigs() {
var deferred = $q.defer();
+
var content = {
issueId : $rootScope.currentDetailIssueId,
- delValue : $scope.vm.issueDownTableConfigs.splice(6,1),
+ 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") {
@@ -161,7 +156,7 @@
// �궗�슜�옄 �젙�쓽 �븘�뱶瑜� 議고쉶�븳 �썑 �몴�떆�븷 �씠�뒋 �뀒�씠釉� 而щ읆�쓣 以�鍮꾪븳�떎.
$scope.fn.getCustomFields().then(function (result) {
- var count = 8;
+ var count = 7;
angular.forEach(result, function (customField) {
$scope.vm.issueDownTableConfigs.push({
name : customField.name,
--
Gitblit v1.8.0