From 1dad4d94cc415d2f8092aff0368744289337f504 Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 화, 22 2월 2022 14:29:43 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/scripts/app/issue/issueList.controller.js | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueList.controller.js b/src/main/webapp/scripts/app/issue/issueList.controller.js
index 53ddc18..ff16c1d 100644
--- a/src/main/webapp/scripts/app/issue/issueList.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueList.controller.js
@@ -338,7 +338,7 @@
case "ISSUE_TITLE" : // �씠�뒋 �젣紐�
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("issue.issueTitle")
- .setDName("issueTitle")
+ .setDName("title")
.setDType("renderer")
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
@@ -454,7 +454,7 @@
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName(customField.name)
.setDType("renderer")
- .setDName("useValue" + [count]) /* todo 泥댄겕*/
+ .setDName("useValue"+count) /* todo 泥댄겕*/
.setHWidth("bold " + issueTableConfig.width)
.setDAlign("text-center")
.setColumnHint(customField)
@@ -848,7 +848,7 @@
}
// �씠�뒋 �닔�젙 �뙘�뾽 �샇異�
- function modify(id) {
+ function modify(id, downTotalCount) {
$uibModal.open({
templateUrl : 'views/issue/issueModify.html',
size : "lg",
@@ -858,14 +858,17 @@
parameter : function () {
return {
id : id,
- issueTypeId : $scope.vm.viewer.issueTypeVo.id
+ issueTypeId : $scope.vm.viewer.issueTypeVo.id,
+ inheritPartners : $scope.vm.viewer.issueTypeVo.inheritPartners,
+ usePartner : $scope.vm.viewer.usePartnerVos,
+ downTotalCount : downTotalCount
};
}
}
});
}
- function addRelationIssueForm(id, issueTypeId) {
+ function addRelationIssueForm(id, project, issueTypeId) {
$uibModal.open({
templateUrl : 'views/issue/issueAddRelation.html',
size : "lg",
@@ -875,6 +878,7 @@
parameter : function () {
return {
id : id,
+ project : project,
issueTypeId : issueTypeId
};
}
@@ -882,7 +886,7 @@
});
}
- function addDownIssueForm(id, issueTypeId) {
+ function addDownIssueForm(id, project, issueTypeId) {
$uibModal.open({
templateUrl : 'views/issue/issueAddDown.html',
size : "lg",
@@ -892,6 +896,7 @@
parameter : function () {
return {
id : id,
+ project : project,
issueTypeId : issueTypeId
};
}
--
Gitblit v1.8.0