From 49cc431b9caedd37b10d017867b014658cbeafba Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 07 12월 2021 09:31:26 +0900
Subject: [PATCH] - 이슈, 프로젝트 - 담당자 -> 담당부서 수정 - 프로젝트 관리자가 아닐경우 이슈리스트에 본인이 소속된 부서가 담당인 이슈만 표시
---
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index 3c41b1c..d3dda22 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -131,6 +131,13 @@
angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
+ // �씠�뒋 紐⑸줉 �뜲�씠�꽣 媛깆떊
+ $scope.$on("getIssueList", function () {
+ $scope.fn.getIssueDetail();
+ });
+
+
+
// �븯�쐞 �씠�뒋 �궘�젣
function removeDownIssue(id) {
// �궘�젣 �븣由�
@@ -644,10 +651,15 @@
}
// �씠�뒋紐낆쓣 �겢由��븯硫� �씠�뒋 �긽�꽭 �젙蹂대�� 議고쉶�븳�떎.
- // $rootScope.$on("getIssueDetail", function (event, args) {
- // $scope.vm.viewer.id = args["id"];
- // $scope.fn.getIssueDetail();
- // });
+ // $rootScope.$on("getIssueDetail", function (event, args) {
+ // $scope.vm.viewer.id = args["id"];
+ // $scope.fn.getIssueDetail();
+ // });
+
+ // �씠硫붿씪 蹂대궦�썑 �긽�꽭�솕硫� 媛깆떊
+ $rootScope.$on("getIssueDetail", function (event, args) {
+ $scope.fn.getIssueDetail();
+ });
// �씠�뒋紐낆쓣 �겢由��븯硫� �씠�뒋 �긽�꽭 �젙蹂대�� 議고쉶�븳�떎.
// $scope.$on("getIssueDetail", function (event, args) {
@@ -750,6 +762,7 @@
}
});
}
+
// �븯�쐞 �씠�뒋 紐⑸줉 �뀒�씠釉� �꽕�젙
function addDownIssueTableConfig() {
@@ -858,13 +871,14 @@
// �븯�쐞 �씠�뒋 諛섎ぉ臾�
if (result.data.data.issueDownVos !== null){
angular.forEach(result.data.data.issueDownVos, function (issueDownVo){
- $scope.vm.form.issuesDown.push(issueDownVo.issue);
+ //$scope.vm.form.issuesDown.push(issueDownVo.issueDown);
+ $scope.vm.form.issuesDown.push(issueDownVo);
});
}
$scope.vm.viewer.issueRelationVos = result.data.data.issueRelationVos;
$scope.vm.viewer.issueDownVos = result.data.data.issueDownVos;
- if ($rootScope.workProject.id > -1) {
+ if ($rootScope.workProject.id > -1 && result.data.data.projectVo !== null) {
$rootScope.changeLastProject(result.data.data.projectVo.id);
}
}
@@ -1071,9 +1085,9 @@
// �듅�젙 �궗�슜�옄�뿉寃� �씠�뒋瑜� 硫붿씪濡� 諛쒖넚
function sendMail(partnersAll, partners) {
$uibModal.open({
- templateUrl : 'views/issue/issueSendMail.html',
+ templateUrl : 'views/issue/issueSendMailPartners.html',
size : "md",
- controller : 'issueSendMailController',
+ controller : 'issueSendMailPartnersController',
backdrop : 'static',
resolve : {
parameter : {
@@ -1081,9 +1095,6 @@
partners : partners,
issueId : $scope.vm.viewer.id,
projectId : $scope.vm.viewer.projectVo.id,
- ispVos : $scope.vm.viewer.ispVos,
- hosingVos : $scope.vm.viewer.hosingVos,
- companyVos : $scope.vm.viewer.companyVos,
}
}
});
--
Gitblit v1.8.0