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/issueAddDown.controller.js | 97 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 68 insertions(+), 29 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAddDown.controller.js b/src/main/webapp/scripts/app/issue/issueAddDown.controller.js
index 251cba8..8d58bbe 100644
--- a/src/main/webapp/scripts/app/issue/issueAddDown.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddDown.controller.js
@@ -843,9 +843,7 @@
}).then(function (result) {
if (result.data.message.status === "success") {
- $scope.fn.addDownIssue(result.data.data);
-
- $scope.fn.cancel();
+ $scope.fn.addDownIssue(result.data.data, result.data.content);
// �씠�뒋 �긽�꽭 �솕硫� �슂泥�
$rootScope.$broadcast("getIssueDetail", {
@@ -861,40 +859,81 @@
});
}
- // �뿰愿� �씠�뒋 異붽�
- function addDownIssue(downId) {
- /*if ($scope.vm.issueName.length == 0 || $scope.vm.form.issues.length == 0
- || $scope.vm.issueName != $scope.vm.form.issues[0].title) {
- SweetAlert.error($filter("translate")("issue.errorSelectRelationIssue"), "");
- return;
- }*/
+ // �븯�쐞 �씠�뒋 異붽�
+ function addDownIssue(downId, inheritYn) {
+ $rootScope.spinner = true;
+
var ids = [];
if (downId != null) {
ids.push(downId);
}
- var contents = {
- //relationIssueType : $scope.vm.form.relationIssueTypeId,
- // issueId : $rootScope.currentDetailIssueId,
- issueId : parameter.id,
- ids : ids,
- parentIssueId : parameter.id
- };
+ if ($rootScope.isDefined(inheritYn) && inheritYn) {
+ 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 = false;
+ }
- Issue.modifyParentIssue($resourceProvider.getContent(
- contents,
- $resourceProvider.getPageContent(0, 10))).then(function (result) {
+ var contents = {
+ issueId : parameter.id,
+ ids : ids,
+ parentIssueId : parameter.id,
+ inheritYn : inheritYn
+ };
- if (result.data.message.status === "success") {
- // �씠�뒋 �긽�꽭 �솕硫� �슂泥�
- $rootScope.$broadcast("getIssueDetail", {
- id : parameter.id
+ Issue.modifyParentIssue($resourceProvider.getContent(
+ contents,
+ $resourceProvider.getPageContent(0, 10))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ $scope.fn.cancel();
+ // �씠�뒋 �긽�꽭 �솕硫� �슂泥�
+ $rootScope.$broadcast("getIssueDetail", {
+ id : parameter.id
+ });
+ }
+ else {
+ SweetAlert.error($filter("translate")("issue.failedToIssueAddIssueDown"), result.data.message.message); // "�븯�쐞�씠�뒋 �깮�꽦 �떎�뙣"
+ }
+ $rootScope.spinner = false;
});
- }
- else {
- SweetAlert.error($filter("translate")("issue.failedToIssueAddIssueDown"), result.data.message.message); // "�뿰愿��씪媛� �깮�꽦 �떎�뙣"
- }
- });
+ });
+ } else {
+
+ var contents = {
+ issueId : parameter.id,
+ ids : ids,
+ parentIssueId : parameter.id,
+ inheritYn : inheritYn
+ };
+
+ Issue.modifyParentIssue($resourceProvider.getContent(
+ contents,
+ $resourceProvider.getPageContent(0, 10))).then(function (result) {
+
+ if (result.data.message.status === "success") {
+ SweetAlert.close();
+ // �씠�뒋 �긽�꽭 �솕硫� �슂泥�
+ $rootScope.$broadcast("getIssueDetail", {
+ id : parameter.id
+ });
+ }
+ else {
+ SweetAlert.error($filter("translate")("issue.failedToIssueAddIssueDown"), result.data.message.message); // "�븯�쐞�씠�뒋 �깮�꽦 �떎�뙣"
+ }
+ });
+ }
}
// �뙘�뾽 李� �떕湲�
--
Gitblit v1.8.0