From 4ca3a63a192a8a2a03f287ee406780b78f359b89 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 21 12월 2021 14:03:39 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js | 74 ++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 29 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js b/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
index a02727a..9b232ae 100644
--- a/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddRelationTableConfig.controller.js
@@ -8,8 +8,8 @@
'angular'
],
function (app, angular) {
- app.controller('issueAddRelationTableConfigController', ['$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('issueAddRelationTableConfigController', ['$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) {
// �븿�닔 紐⑥쓬
@@ -23,49 +23,63 @@
// 蹂��닔 紐⑥쓬
$scope.vm = {
- issueId: "",
+ issueTypeId: "",
issueRelTableConfigs : [{
+ name : $filter("translate")("issue.relationIssueType"), // �뿰愿� �씠�뒋 援щ텇
+ key : "RELATION_ISSUE_TYPE",
+ width : "width-60-p",
+ position : 0,
+ display : true,
+ checkboxShow : false
+ }, {
+ name : $filter("translate")("issue.relationIssueTitle"), // �뿰愿� �씠�뒋 �젣紐�
+ key : "RELATION_ISSUE_TITLE",
+ width : "width-60-p",
+ position : 0,
+ display : true,
+ checkboxShow : false
+ }, {
name : $filter("translate")("common.priority"), // �슦�꽑�닚�쐞
- key : "PRIORITY",
- width : "width-100-p",
+ key : "RELATION_PRIORITY",
+ width : "width-50-p",
position : 1,
- display : false
+ display : false,
+ checkboxShow : true
}, {
name : $filter("translate")("common.importance"), // 以묒슂�룄
- key : "SEVERITY",
- width : "width-100-p",
+ key : "RELATION_SEVERITY",
+ width : "width-50-p",
position : 2,
- display : false
- }, {
- name : $filter("translate")("issue.issueType"), // �씠�뒋 ���엯
- key : "ISSUE_TYPE",
- width : "width-100-p",
- position : 3,
- display : false
+ display : false,
+ checkboxShow : true
}, {
name : $filter("translate")("common.assigneeTeam"), // �떞�떦遺��꽌
- key : "ASSIGNEE_TEAM",
+ key : "RELATION_ASSIGNEE_TEAM",
width : "width-50-p",
- position : 4,
- display : false
+ position : 3,
+ display : false,
+ checkboxShow : true
}, {
name : $filter("translate")("common.register"), // �벑濡앹옄
- key : "REGISTER",
+ key : "RELATION_REGISTER",
width : "width-50-p",
- position : 5,
- display : false
+ position : 4,
+ display : false,
+ checkboxShow : true
}, {
name : $filter("translate")("common.period"), // 湲곌컙
- key : "PERIOD",
+ key : "RELATION_PERIOD",
width : "width-100-p",
- position : 6,
- display : false
+ position : 5,
+ display : false,
+ checkboxShow : true
}, {
name : $filter("translate")("common.lastChangeDate"), // 理쒓렐 蹂�寃쎌씪
- key : "MODIFY_DATE",
+ key : "RELATION_MODIFY_DATE",
width : "width-100-p",
- position : 7,
- display : false
+ position : 6,
+ display : false,
+ checkboxShow : true
}, {
}]
};
@@ -85,7 +99,7 @@
$rootScope.spinner = true;
var content = {
- issueId : $rootScope.currentDetailIssueId,
+ issueTypeId : $rootScope.getCurrentIssueTypeId(),
issueTableConfigs : JSON.stringify($scope.vm.issueRelTableConfigs)
};
@@ -139,7 +153,8 @@
var content = {
issueId : $rootScope.currentDetailIssueId,
- delValue : $scope.vm.issueRelTableConfigs.splice(7,1),
+ issueTypeId : $rootScope.getCurrentIssueTypeId(),
+ delValue : $scope.vm.issueRelTableConfigs.splice(8,1),
issueTableConfigs : JSON.stringify($scope.vm.issueRelTableConfigs)
};
@@ -164,6 +179,7 @@
key : "CUSTOM_FIELD_" + customField.id,
width : "width-100-p",
display : false,
+ checkboxShow : true,
position : count
});
--
Gitblit v1.8.0