From 424867c3809bb49bd1cc8a8db10bf656d8617a1d Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 수, 01 12월 2021 11:49:25 +0900
Subject: [PATCH] 이메일 수정 진행중 , 이슈 상세 및 이슈 리스트 수정
---
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 57 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index fe209d8..955bfbb 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -43,6 +43,7 @@
$scope.fn.getDownTableConfigs = getDownTableConfigs;
$scope.fn.containsPartner = containsPartner;
$scope.fn.onActivate = onActivate;
+ $scope.fn.makePartnersEmail = makePartnersEmail;
// �씠�뒋 紐⑸줉 而⑦듃濡ㅻ윭 vm, fn �긽�냽 以�
$scope.vm.viewer = {};
@@ -72,7 +73,10 @@
$scope.vm.form = {
issues : [], //�뿰愿� �씪媛�
- issuesDown : [] // �븯�쐞 �씪媛�
+ issuesDown : [], // �븯�쐞 �씪媛�
+ issueCompanyVos : [],
+ issueIspVos : [],
+ issueHostingVos : []
};
@@ -636,16 +640,25 @@
}
// �씠�뒋紐낆쓣 �겢由��븯硫� �씠�뒋 �긽�꽭 �젙蹂대�� 議고쉶�븳�떎.
- $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();
+ // });
// �씠�뒋紐낆쓣 �겢由��븯硫� �씠�뒋 �긽�꽭 �젙蹂대�� 議고쉶�븳�떎.
- $scope.$on("getIssueDetail", function (event, args) {
- $scope.vm.viewer.id = args["id"];
- $scope.fn.getIssueDetail();
- });
+ // $scope.$on("getIssueDetail", function (event, args) {
+ // $scope.vm.viewer.id = args["id"];
+ // $scope.fn.getIssueDetail();
+ // });
+
+ $scope.$watch(function() {
+ return $rootScope.currentDetailIssueId;
+ }, function() {
+ if ($rootScope.currentDetailIssueId != null) {
+ $scope.vm.viewer.id = $rootScope.currentDetailIssueId;
+ $scope.fn.getIssueDetail();
+ }
+ }, true);
// 珥덇린�솕 �빐�빞�븷 �븷紐⑹쓣 吏��젙�븯�뿬 �떎瑜� �씠�뒋瑜� �겢由��븷 �븣 珥덇린�솕�빐以��떎.
function initReload() {
@@ -653,9 +666,9 @@
$scope.vm.issueForm.issueStatusList = [];
$scope.vm.issueForm.issueStatusId = "";
$scope.vm.issueTypeId = $rootScope.getCurrentIssueTypeId();
- /*if ($scope.$root.$$phase !== '$apply' && $scope.$root.$$phase !== '$digest') {
- $scope.$apply();
- }*/
+ // if ($scope.$root.$$phase !== '$apply' && $scope.$root.$$phase !== '$digest') {
+ // $scope.$apply();
+ // }
}
// �씠�뒋 �긽�깭 蹂�寃�
@@ -804,7 +817,7 @@
$scope.fn.getDownTableConfigs();
Issue.detail($resourceProvider.getContent(
- {id : $scope.vm.viewer.id, deep : "02", customFields : $scope.vm.customFields},
+ {id : $scope.vm.viewer.id, deep : "02"},
$resourceProvider.getPageContent(0, 1))).then(function (result) {
if (result.data.message.status === "success") {
@@ -846,6 +859,10 @@
}
$scope.vm.viewer.issueRelationVos = result.data.data.issueRelationVos;
$scope.vm.viewer.issueDownVos = result.data.data.issueDownVos;
+
+ if ($rootScope.workProject.id > -1) {
+ $rootScope.changeLastProject(result.data.data.projectVo.id);
+ }
}
}
else {
@@ -1038,8 +1055,15 @@
});
}
+ // �뾽泥�/ISP/�샇�뒪�똿 諛곗뿴媛믪쓣 �븯�굹濡� �빀爾먯꽌 硫붿씪 �겢由��떆 �쟾�떖
+ function makePartnersEmail() {
+ $scope.vm.form.partnersEmail = $scope.vm.viewer.issueCompanyVos.concat($scope.vm.viewer.issueIspVos, $scope.vm.viewer.issueHostingVos)
+ return $scope.vm.form.partnersEmail;
+ }
+
// �듅�젙 �궗�슜�옄�뿉寃� �씠�뒋瑜� 硫붿씪濡� 諛쒖넚
function sendMail(issueId, projectId) {
+ makePartnersEmail();
$uibModal.open({
templateUrl : 'views/issue/issueSendMail.html',
size : "md",
@@ -1049,11 +1073,12 @@
parameter : function () {
return {
departmentVos : [$scope.vm.form.issues[0].departmentVos],
- issueCompanyFields : [$scope.vm.form.issues[0].issueCompanyVos],
- issueIspFields : [$scope.vm.form.issues[0].issueIspVos],
- issueHostingFields : [$scope.vm.form.issues[0].issueHostingVos],
+ partners : $scope.vm.form.partnersEmail,
issueId : issueId,
projectId : projectId
+ // issueCompanyFields : [$scope.vm.viewer.issueCompanyVos[0]],
+ // issueIspFields : [$scope.vm.viewer.issueIspVos[0]],
+ // issueHostingFields : [$scope.vm.viewer.issueHostingVos[0]],
};
}
}
--
Gitblit v1.8.0