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/issueAddTableConfig.controller.js | 35 ++++++++++++++++++++++++----------- 1 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js index 9e26735..1ddebb6 100644 --- a/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js +++ b/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js @@ -23,46 +23,58 @@ // 蹂��닔 紐⑥쓬 $scope.vm = { issueTableConfigs : [{ + name : $filter("translate")("issue.issueTitle"), // �씠�뒋 �젣紐� + key : "ISSUE_TITLE", + width : "width-140-p", + position : 1, + display : true + }, { name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞 key : "PRIORITY", width : "width-80-p", - position : 1, + position : 2, display : true }, { name : $filter("translate")("common.importance"), // 以묒슂�룄 key : "SEVERITY", width : "width-80-p", - position : 2, + position : 3, display : true }, { name : $filter("translate")("issue.issueType"), // �씠�뒋 ���엯 key : "ISSUE_TYPE", width : "width-140-p", - position : 3, + position : 4, display : true }, { name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌 key : "ASSIGNEE_TEAM", width : "width-100-p", - position : 4, + position : 5, display : true + }, { + name : $filter("translate")("common.countDownIssue"), // �븯�쐞�씠�뒋 移댁슫�듃 + key : "COUNT_DOWN_ISSUE", + width : "width-100-p", + position : 6, + display : false }, { name : $filter("translate")("common.register"), // �벑濡앹옄 key : "REGISTER", width : "width-100-p", - position : 5, + position : 7, display : false }, { name : $filter("translate")("common.period"), // 湲곌컙 key : "PERIOD", width : "width-140-p", - position : 6, + position : 8, display : false }, { name : $filter("translate")("common.lastChangeDate"), // 理쒓렐 蹂�寃쎌씪 key : "MODIFY_DATE", width : "width-100-p", - position : 7, + position : 9, display : false }, { }] @@ -83,7 +95,7 @@ $rootScope.spinner = true; var content = { - issueTypeId : parameter.issueTypeId, + issueTypeId : $rootScope.getCurrentIssueTypeId(), issueTableConfigs : JSON.stringify($scope.vm.issueTableConfigs) }; @@ -131,8 +143,9 @@ } var content = { - delValue : $scope.vm.issueTableConfigs.splice(7,1), - issueTableConfigs : JSON.stringify($scope.vm.issueTableConfigs) + delValue : $scope.vm.issueTableConfigs.splice(9,1), + issueTableConfigs : JSON.stringify($scope.vm.issueTableConfigs), + issueTypeId : $rootScope.getCurrentIssueTypeId() }; // �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙 �젙蹂대�� 媛��졇�삩�떎. function getIssueAddTableConfigs() { @@ -159,7 +172,7 @@ // �궗�슜�옄 �젙�쓽 �븘�뱶瑜� 議고쉶�븳 �썑 �몴�떆�븷 �씠�뒋 �뀒�씠釉� 而щ읆�쓣 以�鍮꾪븳�떎. $scope.fn.getCustomFields().then(function (result) { - var count = 7; + var count = 10; angular.forEach(result, function (customField) { $scope.vm.issueTableConfigs.push({ name : customField.name, -- Gitblit v1.8.0