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/issueAddDown.controller.js | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAddDown.controller.js b/src/main/webapp/scripts/app/issue/issueAddDown.controller.js
index 8d58bbe..b51b126 100644
--- a/src/main/webapp/scripts/app/issue/issueAddDown.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddDown.controller.js
@@ -843,7 +843,7 @@
}).then(function (result) {
if (result.data.message.status === "success") {
- $scope.fn.addDownIssue(result.data.data, result.data.content);
+ $scope.fn.addDownIssue(result.data.data);
// �씠�뒋 �긽�꽭 �솕硫� �슂泥�
$rootScope.$broadcast("getIssueDetail", {
@@ -860,15 +860,18 @@
}
// �븯�쐞 �씠�뒋 異붽�
- function addDownIssue(downId, inheritYn) {
+ function addDownIssue(issueVo) {
$rootScope.spinner = true;
+ let inheritYn = issueVo.inheritPartners;
+ let usePartner = issueVo.usePartner;
var ids = [];
- if (downId != null) {
- ids.push(downId);
+ if (issueVo.id != null) {
+ ids.push(issueVo.id);
}
- if ($rootScope.isDefined(inheritYn) && inheritYn) {
+ if ($rootScope.isDefined(usePartner) && usePartner > 0
+ && $rootScope.isDefined(inheritYn) && inheritYn) {
SweetAlert.swal({
title : $filter("translate")("issue.addDownIssue"), // �븯�쐞 �씠�뒋 異붽�
text : $filter("translate")("issue.wantToInheritPartnersOfParentIssue"), // �긽�쐞�씠�뒋�쓽 �뙆�듃�꼫 �젙蹂�(�뾽泥�/ISP/�샇�뒪�똿)瑜� �쟻�슜�떆�궎寃좎뒿�땲源�?
@@ -923,7 +926,7 @@
$resourceProvider.getPageContent(0, 10))).then(function (result) {
if (result.data.message.status === "success") {
- SweetAlert.close();
+ $scope.fn.cancel();
// �씠�뒋 �긽�꽭 �솕硫� �슂泥�
$rootScope.$broadcast("getIssueDetail", {
id : parameter.id
--
Gitblit v1.8.0