From 13df3419f367b1448a844120840459a17df02f3a Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 21 12월 2021 11:17:02 +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 | 52 +++++++++++++++++++++++++++++++---------------------
1 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
index a14c502..7d71568 100644
--- a/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddTableConfig.controller.js
@@ -8,8 +8,8 @@
'angular'
],
function (app, angular) {
- app.controller('issueAddTableConfigController', ['$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) {
+ app.controller('issueAddTableConfigController', ['$scope', '$rootScope', '$log', '$resourceProvider', '$uibModalInstance', 'SweetAlert', '$timeout', 'IssueTableConfig', 'IssueTypeCustomField', '$q', '$filter', 'parameter',
+ function ($scope, $rootScope, $log, $resourceProvider, $uibModalInstance, SweetAlert, $timeout, IssueTableConfig, IssueTypeCustomField, $q, $filter, parameter) {
// �븿�닔 紐⑥쓬
$scope.fn = {
@@ -26,56 +26,65 @@
name : $filter("translate")("issue.issueTitle"), // �씠�뒋 �젣紐�
key : "ISSUE_TITLE",
width : "width-140-p",
- position : 1,
- display : true
+ position : 0,
+ display : true,
+ checkboxShow : false
}, {
name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞
key : "PRIORITY",
width : "width-80-p",
- position : 2,
- display : true
+ position : 1,
+ display : true,
+ checkboxShow : true
}, {
name : $filter("translate")("common.importance"), // 以묒슂�룄
key : "SEVERITY",
width : "width-80-p",
- position : 3,
- display : true
+ position : 2,
+ display : true,
+ checkboxShow : true
}, {
name : $filter("translate")("issue.issueType"), // �씠�뒋 ���엯
key : "ISSUE_TYPE",
width : "width-140-p",
- position : 4,
- display : true
+ position : 3,
+ display : true,
+ checkboxShow : true
}, {
name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
key : "ASSIGNEE_TEAM",
width : "width-100-p",
- position : 5,
- display : true
+ position : 4,
+ display : true,
+ checkboxShow : true
}, {
name : $filter("translate")("common.countDownIssue"), // �븯�쐞�씠�뒋 移댁슫�듃
key : "COUNT_DOWN_ISSUE",
width : "width-100-p",
- position : 6,
- display : false
+ position : 5,
+ display : false,
+ checkboxShow : true
}, {
name : $filter("translate")("common.register"), // �벑濡앹옄
key : "REGISTER",
width : "width-100-p",
- position : 7,
- display : false
+ position : 6,
+ display : false,
+ checkboxShow : true
}, {
name : $filter("translate")("common.period"), // 湲곌컙
key : "PERIOD",
width : "width-140-p",
- position : 8,
- display : false
+ position : 7,
+ display : false,
+ checkboxShow : true
}, {
name : $filter("translate")("common.lastChangeDate"), // 理쒓렐 蹂�寃쎌씪
key : "MODIFY_DATE",
width : "width-100-p",
- position : 9,
- display : false
+ position : 8,
+ display : false,
+ checkboxShow : true
}, {
}]
};
@@ -130,7 +139,7 @@
function getCustomFields() {
var deferred = $q.defer();
- CustomField.find($resourceProvider.getContent({},
+ IssueTypeCustomField.findByIssueType($resourceProvider.getContent({issueTypeId : $rootScope.getCurrentIssueTypeId()},
$resourceProvider.getPageContent(0, 1000))).then(function (result) {
if (result.data.message.status !== "success") {
SweetAlert.error($filter("translate")("issue.failedToUserDefinedFieldListLookup"), result.data.message.message); // �궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉 議고쉶 �떎�뙣
@@ -179,6 +188,7 @@
key : "CUSTOM_FIELD_" + customField.id,
width : "width-100-p",
display : false,
+ checkboxShow : true,
position : count
});
--
Gitblit v1.8.0