From 847964a54223b33e5c94c18dee5edef7d211ec77 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 03 1월 2022 14:32:46 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 86 +++++++++++++++++++------------------------
1 files changed, 38 insertions(+), 48 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 3423551..84bfa4e 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -126,13 +126,18 @@
// �씠�뒋 踰덊샇瑜� ���옣�븳 �썑 �씠�뒋 紐⑸줉�쑝濡� �씠�룞�븳�떎.
//$rootScope.$broadcast("makeIssueSearch",issue);
$scope.$parent.tableEvent.changeDetailView(issue.id);
+
$scope.fn.onActivate();
}
// �긽�쐞 �씠�뒋 �겢由��떆 �긽�쐞 �씠�뒋濡� �씠�룞
function issueBack() {
- $rootScope.currentDetailIssueId = $scope.vm.viewer.parentIssueVo.id
- $rootScope.$broadcast("getIssueDetail", {id: $rootScope.currentDetailIssueId});
+ var index = $scope.$parent.vm.issueIds.length -2;
+ if (index > -1) {
+ var preIssueId = $scope.$parent.vm.issueIds[index];
+ $scope.$parent.vm.issueIds.splice(index + 1, 1);
+ $scope.$parent.tableEvent.changeDetailView(preIssueId, true);
+ }
}
function onActivate() {
@@ -151,7 +156,7 @@
// �궘�젣 �븣由�
SweetAlert.swal({
title : $filter("translate")("issue.downIssueRemove"), // �븯�쐞 �씠�뒋 �궘�젣
- text : $filter("translate")("issue.wantToDeleteSelectIssue"),
+ text : $filter("translate")("issue.wantToDeleteSelectDownIssueInList"),
type : "warning",
showCancelButton : true,
confirmButtonColor : "#DD6B55",
@@ -247,7 +252,6 @@
case "RELATION_ISSUE_TYPE" : // �뿰愿� �씠�뒋 援щ텇
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("issue.relationIssueType")
- .setDName("relationIssueType")
.setDType("renderer")
.setDAlign("text-center")
.setHWidth("bold " + Rel_issueTableConfig.width)
@@ -258,7 +262,6 @@
case "RELATION_ISSUE_TITLE" : // �뿰愿� �씠�뒋 �젣紐�
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("issue.relationIssueTitle")
- .setDName("relationIssueTitle")
.setDType("renderer")
.setDAlign("text-center")
.setHWidth("bold " + Rel_issueTableConfig.width)
@@ -269,7 +272,6 @@
case "RELATION_PRIORITY" : // �뿰愿� �씠�뒋 �슦�꽑�닚�쐞
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.priority")
- .setDName("relPriority")
.setDType("renderer")
.setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
@@ -278,7 +280,6 @@
case "RELATION_SEVERITY" : // �뿰愿� �씠�뒋 以묒슂�룄
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.importance")
- .setDName("relSeverity")
.setDType("renderer")
.setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
@@ -287,7 +288,6 @@
case "RELATION_ASSIGNEE_TEAM" : // �뿰愿� �씠�뒋 �떞�떦遺��꽌
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.assigneeTeam")
- .setDName("relAssigneeTeam")
.setDType("renderer")
.setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
@@ -297,7 +297,6 @@
case "RELATION_REGISTER" : // �뿰愿� �씠�뒋 �벑濡앹옄
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.register")
- .setDName("relRegister")
.setDType("renderer")
.setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
@@ -306,7 +305,6 @@
case "RELATION_PERIOD" : // �뿰愿� �씠�뒋 湲곌컙
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.period")
- .setDName("relPeriod")
.setDType("renderer")
.setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
@@ -316,8 +314,7 @@
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName("common.lastChangeDate")
.setHWidth("bold " + Rel_issueTableConfig.width)
- .setDAlign("text-center")
- .setDName("relModifyDate"));
+ .setDAlign("text-center"));
break;
}
@@ -331,7 +328,6 @@
$scope.vm.relTableConfigs.push($tableProvider.config()
.setHName(customField.name)
.setDType("renderer")
- .setDName("relCustomFieldName" + [count])
.setHWidth("bold " + Rel_issueTableConfig.width)
.setDAlign("text-center")
.setColumnHint(customField)
@@ -352,7 +348,6 @@
case "DOWN_ISSUE_TITLE" : // �븯�쐞 �씠�뒋 �젣紐�
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("issue.downIssueTitle")
- .setDName("downIssueTitle")
.setDType("renderer")
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
@@ -362,7 +357,6 @@
case "ISSUE_DOWN_STATUS_TYPE" : // �씠�뒋 �긽�깭
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("issue.issueStatus")
- .setDName("downIssueStatus")
.setDType("renderer")
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
@@ -372,7 +366,6 @@
case "DOWN_PRIORITY" : // �븯�쐞 �씠�뒋 �슦�꽑�닚�쐞
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.priority")
- .setDName("downPriority")
.setDType("renderer")
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
@@ -381,7 +374,6 @@
case "DOWN_SEVERITY" : // 以묒슂�룄
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.importance")
- .setDName("downSeverity")
.setDType("renderer")
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
@@ -390,7 +382,6 @@
case "DOWN_ASSIGNEE_TEAM" : // �떞�떦遺��꽌
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.assigneeTeam")
- .setDName("downAssigneeTeam")
.setDType("renderer")
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
@@ -399,7 +390,6 @@
case "DOWN_REGISTER" : // �벑濡앹옄
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.register")
- .setDName("downRegister")
.setDType("renderer")
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
@@ -408,7 +398,6 @@
case "DOWN_PERIOD" : // 湲곌컙
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.period")
- .setDName("downPeriod")
.setDType("renderer")
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
@@ -418,8 +407,7 @@
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName("common.lastChangeDate")
.setHWidth("bold " + Down_issueTableConfig.width)
- .setDAlign("text-center")
- .setDName("downModifyDate"));
+ .setDAlign("text-center"));
break;
}
@@ -433,7 +421,6 @@
$scope.vm.downTableConfigs.push($tableProvider.config()
.setHName(customField.name)
.setDType("renderer")
- .setDName("downCustomFieldName" + [count])
.setHWidth("bold " + Down_issueTableConfig.width)
.setDAlign("text-center")
.setColumnHint(customField)
@@ -462,15 +449,16 @@
.setHWidth("width-60-p bold")
.setHSort(false)
.setDRenderer("ISSUE_RELATION_MOVE"))
- $scope.vm.relTableConfigs.push($tableProvider.config()
- .setHName("issue.relationIssueDelete")
- .setDType("renderer")
- .setDAlign("text-center")
- .setHWidth("width-40-p bold")
- .setDRenderer("ISSUE_RELATION_DELETE")
- .setHSort(false)
- .setDAlign("text-center"))
-
+ if($scope.vm.viewer.modifyPermissionCheck) {
+ $scope.vm.relTableConfigs.push($tableProvider.config()
+ .setHName("issue.relationIssueDelete")
+ .setDType("renderer")
+ .setDAlign("text-center")
+ .setHWidth("width-40-p bold")
+ .setDRenderer("ISSUE_RELATION_DELETE")
+ .setHSort(false)
+ .setDAlign("text-center"))
+ }
angular.forEach($scope.vm.relTableConfigs, function (Rel_issueTableConfig) {
// �몴�떆 ���긽�씤 而щ읆留� �솕硫댁뿉 洹몃젮以��떎.
if (Rel_issueTableConfig.display) {
@@ -551,14 +539,15 @@
}
});
- $scope.vm.relTableConfigs.push($tableProvider.config()
- .setHName("issue.relationIssueDelete")
- .setDType("renderer")
- .setHWidth("width-40-p bold")
- .setDRenderer("ISSUE_RELATION_DELETE")
- .setHSort(false)
- .setDAlign("text-center"))
-
+ if($scope.vm.viewer.modifyPermissionCheck) {
+ $scope.vm.relTableConfigs.push($tableProvider.config()
+ .setHName("issue.relationIssueDelete")
+ .setDType("renderer")
+ .setHWidth("width-40-p bold")
+ .setDRenderer("ISSUE_RELATION_DELETE")
+ .setHSort(false)
+ .setDAlign("text-center"))
+ }
} else {
makeRelTableConfigs();
}
@@ -593,14 +582,15 @@
$scope.fn.setDownTableColumn(Down_issueTableConfig);
}
});
- $scope.vm.downTableConfigs.push($tableProvider.config()
- .setHName("issue.relationIssueDelete")
- .setDType("renderer")
- .setHWidth("width-40-p bold")
- .setDRenderer("ISSUE_DOWN_DELETE")
- .setHSort(false)
- .setDAlign("text-center"))
-
+ if($scope.vm.viewer.modifyPermissionCheck) {
+ $scope.vm.downTableConfigs.push($tableProvider.config()
+ .setHName("issue.relationIssueDelete")
+ .setDType("renderer")
+ .setHWidth("width-40-p bold")
+ .setDRenderer("ISSUE_DOWN_DELETE")
+ .setHSort(false)
+ .setDAlign("text-center"))
+ }
} else {
makeDownTableConfigs();
}
--
Gitblit v1.8.0