From 0f59a76b263ba6cd79380a729f38bfca92a907dd Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 28 12월 2021 17:59:17 +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 | 92 ++++++++++++++++++++++++++--------------------
1 files changed, 52 insertions(+), 40 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
index 8d58039..6bffedf 100644
--- a/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddDownTableConfig.controller.js
@@ -24,48 +24,61 @@
$scope.vm = {
issueId : "",
issueDownTableConfigs : [{
- name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞
- key : "PRIORITY",
+ name : $filter("translate")("issue.downIssueTitle"), // �븯�쐞 �씠�뒋 �젣紐�
+ key : "DOWN_ISSUE_TITLE",
width : "width-80-p",
- position : 1,
- display : false
- }, {
- name : $filter("translate")("common.importance"), // 以묒슂�룄
- key : "SEVERITY",
- width : "width-80-p",
- position : 2,
- display : false
- }, {
- name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
- key : "ASSIGNEE_TEAM",
- width : "width-100-p",
- position : 3,
- display : false
- }, {
- name : $filter("translate")("common.register"), // �벑濡앹옄
- key : "REGISTER",
- width : "width-100-p",
- position : 4,
- display : false
- }, {
- name : $filter("translate")("common.period"), // 湲곌컙
- key : "PERIOD",
- width : "width-140-p",
- position : 5,
- display : false
- }, {
- name : $filter("translate")("common.lastChangeDate"), // 理쒓렐 蹂�寃쎌씪
- key : "MODIFY_DATE",
- width : "width-100-p",
- position : 6,
- display : false
+ position : 0,
+ display : true,
+ checkboxShow : false
}, {
name : $filter("translate")("issue.issueStatus"), // �씠�뒋 �긽�깭
key : "ISSUE_DOWN_STATUS_TYPE",
+ width : "width-50-p",
+ position : 1,
+ display : false,
+ checkboxShow : true
+ }, {
+ name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞
+ key : "DOWN_PRIORITY",
+ width : "width-50-p",
+ position : 2,
+ display : false,
+ checkboxShow : true
+ }, {
+ name : $filter("translate")("common.importance"), // 以묒슂�룄
+ key : "DOWN_SEVERITY",
+ width : "width-50-p",
+ position : 3,
+ display : false,
+ checkboxShow : true
+ }, {
+ name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
+ key : "DOWN_ASSIGNEE_TEAM",
+ width : "width-50-p",
+ position : 4,
+ display : false,
+ checkboxShow : true
+ }, {
+ name : $filter("translate")("common.register"), // �벑濡앹옄
+ key : "DOWN_REGISTER",
+ width : "width-50-p",
+ position : 5,
+ display : false,
+ checkboxShow : true
+ }, {
+ name : $filter("translate")("common.period"), // 湲곌컙
+ key : "DOWN_PERIOD",
+ width : "width-100-p",
+ position : 6,
+ display : false,
+ checkboxShow : true
+ }, {
+ name : $filter("translate")("common.lastChangeDate"), // 理쒓렐 蹂�寃쎌씪
+ key : "DOWN_MODIFY_DATE",
width : "width-100-p",
position : 7,
- display : false
- },{
+ display : false,
+ checkboxShow : true
}]
};
@@ -102,8 +115,6 @@
else {
SweetAlert.error($filter("translate")("issue.failedToSaveIssueTableSetting"), result.data.message.message); // �씠�뒋 �뀒�씠釉� �꽕�젙 ���옣 �떎�뙣
}
-
- $rootScope.spinner = false;
});
}
@@ -137,7 +148,7 @@
var content = {
issueId : $rootScope.currentDetailIssueId,
- delValue : $scope.vm.issueDownTableConfigs.splice(7,1),
+ //delValue : $scope.vm.issueDownTableConfigs.splice(8,1),
issueTypeId : $rootScope.getCurrentIssueTypeId(),
issueTableConfigs : JSON.stringify($scope.vm.issueDownTableConfigs)
};
@@ -156,13 +167,14 @@
// �궗�슜�옄 �젙�쓽 �븘�뱶瑜� 議고쉶�븳 �썑 �몴�떆�븷 �씠�뒋 �뀒�씠釉� 而щ읆�쓣 以�鍮꾪븳�떎.
$scope.fn.getCustomFields().then(function (result) {
- var count = 7;
+ var count = 8;
angular.forEach(result, function (customField) {
$scope.vm.issueDownTableConfigs.push({
name : customField.name,
key : "CUSTOM_FIELD_" + customField.id,
width : "width-100-p",
display : false,
+ checkboxShow : true,
position : count
});
--
Gitblit v1.8.0