From ad486a401ad59d44bd4187f6406fe8c11b046a1f Mon Sep 17 00:00:00 2001
From: minhee <alsdldlfrl@gmail.com>
Date: 월, 21 2월 2022 16:05:09 +0900
Subject: [PATCH] - 파트너 정보 엑셀 임포트 시 연락처, 코드, 이메일 유효성 검사 - 특정 프로젝트로 설정된 상태에서 타 프로젝트의 이슈 클릭 시 대시보드로 이동되는 문제 해결
---
src/main/webapp/scripts/app/issue/issueDetail.controller.js | 72 +++++++++++++++++++++++++-----------
1 files changed, 50 insertions(+), 22 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueDetail.controller.js b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
index b63cd07..6cbd9ca 100644
--- a/src/main/webapp/scripts/app/issue/issueDetail.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueDetail.controller.js
@@ -123,6 +123,9 @@
},
};
+ $scope.vm.inheritPartners = "";
+ $scope.vm.downTotalCount = "";
+
$scope.vm.relResponseData = [];
$scope.vm.relTableConfigs = [];
// �뀒�씠釉� �씠踰ㅽ듃
@@ -810,28 +813,50 @@
return;
}
- var ids = [];
- if ($scope.vm.form.issuesDown[0].id != null) {
- ids.push($scope.vm.form.issuesDown[0].id);
+ let inheritYn = false;
+ if ($scope.vm.inheritPartners) {
+ SweetAlert.swal({
+ title : $filter("translate")("issue.addDownIssue"), // �븯�쐞 �씠�뒋 異붽�
+ text : $filter("translate")("issue.wantToInheritPartnersOfParentIssue"), // �긽�쐞�씠�뒋�쓽 �뙆�듃�꼫 �젙蹂�(�뾽泥�/ISP/�샇�뒪�똿)瑜� �쟻�슜�떆�궎寃좎뒿�땲源�?
+ type : "warning",
+ showCancelButton : true,
+ confirmButtonColor : "#DD6B55",
+ confirmButtonText : $filter("translate")("common.ok"), // �꽕
+ cancelButtonText : $filter("translate")("common.no"), // �븘�땲�삤
+ closeOnConfirm : false,
+ closeOnCancel : false
+ },
+ function (isConfirm) {
+ if (isConfirm) {
+ inheritYn = true;
+ }
+
+ var ids = [];
+ if ($scope.vm.form.issuesDown[0].id != null) {
+ ids.push($scope.vm.form.issuesDown[0].id);
+ }
+
+ var contents = {
+ issueId : $rootScope.currentDetailIssueId,
+ ids : ids,
+ parentIssueId : $rootScope.currentDetailIssueId,
+ inheritYn : inheritYn
+ };
+
+ Issue.modifyParentIssue($resourceProvider.getContent(
+ contents,
+ $resourceProvider.getPageContent(0, 10))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ SweetAlert.close();
+ $scope.fn.getIssueDetail(0,0);
+ }
+ else {
+ SweetAlert.error($filter("translate")("issue.failedToIssueAddIssueDown"), result.data.message.message); // "�븯�쐞�씠�뒋 �깮�꽦 �떎�뙣"
+ }
+ });
+ });
}
-
- var contents = {
- issueId : $rootScope.currentDetailIssueId,
- ids : ids,
- parentIssueId : $rootScope.currentDetailIssueId
- };
-
- Issue.modifyParentIssue($resourceProvider.getContent(
- contents,
- $resourceProvider.getPageContent(0, 10))).then(function (result) {
-
- if (result.data.message.status === "success") {
- $scope.fn.getIssueDetail(0,0);
- }
- else {
- SweetAlert.error($filter("translate")("issue.failedToIssueAddIssueDown"), result.data.message.message); // "�뿰愿��씪媛� �깮�꽦 �떎�뙣"
- }
- });
}
// �씠�뒋紐낆쓣 �겢由��븯硫� �씠�뒋 �긽�꽭 �젙蹂대�� 議고쉶�븳�떎.
@@ -1174,8 +1199,11 @@
$scope.vm.viewer.issueDownVos = result.data.data.issueDownVos;
if ($rootScope.workProject.id > -1 && result.data.data.projectVo !== null) {
- $rootScope.changeLastProject(result.data.data.projectVo.id);
+ $rootScope.changeLastProject(result.data.data.projectVo.id, false, false);
}
+
+ $scope.vm.inheritPartners = result.data.data.issueTypeVo.inheritPartners;
+ $scope.vm.downTotalCount = result.data.data.downTotalCount;
}
}
else {
--
Gitblit v1.8.0