From b1d7844cb525a36b1e0e193e9e96a2531d4badeb Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 22 2월 2022 14:23:26 +0900
Subject: [PATCH] - 이슈유형 설정에 상위 이슈 업체/ISP/호스팅 상속 기능 - 워크플로우에 속해있는 부서 삭제 시 팝업 메시지 수정
---
src/main/webapp/scripts/app/issue/issueAddDown.controller.js | 443 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 331 insertions(+), 112 deletions(-)
diff --git a/src/main/webapp/scripts/app/issue/issueAddDown.controller.js b/src/main/webapp/scripts/app/issue/issueAddDown.controller.js
index e455886..b51b126 100644
--- a/src/main/webapp/scripts/app/issue/issueAddDown.controller.js
+++ b/src/main/webapp/scripts/app/issue/issueAddDown.controller.js
@@ -40,6 +40,11 @@
getPartners : getPartners,
addDownIssue : addDownIssue,
getDepartments : getDepartments,
+ getCompanyTypeListCallBack : getCompanyTypeListCallBack,
+ getParentSectorListCallBack : getParentSectorListCallBack,
+ getChildSectorListCallBack : getChildSectorListCallBack,
+ getRegionListCallBack : getRegionListCallBack,
+ getStatusListCallBack : getStatusListCallBack,
};
$scope.vm = {
@@ -52,7 +57,7 @@
issueCompanyFields : [], // �뾽泥댁젙蹂�
issueIspFields : [], // ISP �젙蹂�
issueHostingFields : [], // �샇�뒪�똿�젙蹂�
- issueTypeId : "", // �씠�뒋 �쑀�삎 �븘�씠�뵒
+ issueTypeId : parameter.issueTypeId, // �씠�뒋 �쑀�삎 �븘�씠�뵒
priorityId : "", // �슦�꽑�닚�쐞 �븘�씠�뵒
severityId : "", // 以묒슂�룄 �븘�씠�뵒
users : [], // �떞�떦�옄
@@ -63,6 +68,16 @@
detectingDateRange : "", // �깘吏��씪
issueCustomFields : [], // �씠�뒋�뿉�꽌 �궗�슜�릺�뒗 �궗�슜�옄 �젙�쓽 �븘�뱶
removeFiles : [], // �궘�젣 �뙆�씪
+ companyTypeId : "",
+ companyType : "", //湲곗뾽援щ텇
+ parentSectorId : "",
+ parentSector : "", //�뾽醫�(��遺꾨쪟)
+ childSectorId : "",
+ childSector : "", //�뾽醫�(以묐텇瑜�)
+ regionId : "",
+ region : "", //吏��뿭
+ statusId : "",
+ status : "", //�긽�깭
},
id : parameter.id,
infiniteAdd : false, // �뿰�냽 �깮�꽦
@@ -93,8 +108,6 @@
hostingUrl : "", // �샇�뒪�똿 url
hostingMemo :"", // �샇�뒪�똿 鍮꾧퀬
-
-
autoCompletePage : {
user : {
page : 0,
@@ -119,6 +132,26 @@
hostingField : {
page : 0,
totalPage : 0
+ },
+ companyType : {
+ page : 0,
+ totalPage : 0
+ },
+ parentSector : {
+ page : 0,
+ totalPage : 0
+ },
+ childSector : {
+ page : 0,
+ totalPage : 0
+ },
+ region : {
+ page : 0,
+ totalPage : 0
+ },
+ status : {
+ page : 0,
+ totalPage : 0
}
},
summerNote : {
@@ -129,6 +162,14 @@
priorities : [], // �슦�꽑�닚�쐞 �젙蹂�
severities : [], // 以묒슂�룄 �젙蹂�
fileTableConfigs : [], // �뙆�씪 �뾽濡쒕뱶 �젙蹂� �뀒�씠釉�
+
+ typeCategory : {
+ companyType : "COMPANYTYPE",
+ parentSector : "PARENTSECTOR",
+ childSector : "CHILDSECTOR",
+ region : "REGION",
+ status : "STATUS"
+ },
};
angular.extend(this, $controller('autoCompleteController', {$scope : $scope, $injector : $injector}));
@@ -143,7 +184,6 @@
// �봽濡쒖젥�듃媛� 蹂�寃쎈릺硫� �떞�떦�옄 珥덇린�솕
$scope.$watch("vm.form.projects", function (newValue, oldValue) {
-
if (angular.isDefined(newValue)) {
if (newValue.length < 1) {
@@ -374,6 +414,40 @@
$scope.vm.autoCompletePage.hostingField.totalPage = result.data.page.totalPage;
}
+ // �뾽泥� 移댄뀒怨좊━ autocomplete page �뾽�뜲�씠�듃
+ function getCompanyTypeListCallBack(result) {
+ $scope.vm.autoCompletePage.companyType.totalPage = result.data.page.totalPage;
+ }
+
+ // �뾽泥� 移댄뀒怨좊━ autocomplete page �뾽�뜲�씠�듃
+ function getParentSectorListCallBack(result, value) {
+ if (value === "") {
+ $scope.vm.form.parentSectorId = "";
+ if ($rootScope.isDefined($scope.vm.form.parentSectors) && $rootScope.isDefined($scope.vm.form.parentSectors[0])) {
+ $scope.vm.form.parentSectors[0].id = "";
+ }
+ $scope.vm.form.childSectorId = "";
+ $scope.vm.form.childSector = "";
+ $scope.vm.form.childSectors = [];
+ }
+ $scope.vm.autoCompletePage.parentSector.totalPage = result.data.page.totalPage;
+ }
+
+ // �뾽泥� 移댄뀒怨좊━ autocomplete page �뾽�뜲�씠�듃
+ function getChildSectorListCallBack(result) {
+ $scope.vm.autoCompletePage.childSector.totalPage = result.data.page.totalPage;
+ }
+
+ // �뾽泥� 移댄뀒怨좊━ autocomplete page �뾽�뜲�씠�듃
+ function getRegionListCallBack(result) {
+ $scope.vm.autoCompletePage.region.totalPage = result.data.page.totalPage;
+ }
+
+ // �뾽泥� 移댄뀒怨좊━ autocomplete page �뾽�뜲�씠�듃
+ function getStatusListCallBack(result) {
+ $scope.vm.autoCompletePage.status.totalPage = result.data.page.totalPage;
+ }
+
// �뤌 泥댄겕
function formCheck(formInvalid) {
if (formInvalid) {
@@ -384,79 +458,129 @@
// �뾽泥댁젙蹂� 寃곌낵 媛� Event 泥섎━(set)
$scope.$on("companyFieldEvent", function (event, result) {
- var ispFieldVo = result[0].ispFieldVo;
- var hostingFieldVo = result[0].hostingFieldVo;
+ if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) {
+ var ispFieldVo = result[0].ispFieldVo;
+ var hostingFieldVo = result[0].hostingFieldVo;
- $scope.vm.companyId = result[0].id;
- $scope.vm.companyName = result[0].name;
- $scope.vm.companyManager = result[0].manager;
- $scope.vm.companyTel = result[0].tel;
- $scope.vm.companyEmail = result[0].email;
- $scope.vm.companyUrl = result[0].url;
- $scope.vm.companyMemo = result[0].memo;
+ $scope.vm.companyId = result[0].id;
+ $scope.vm.companyName = result[0].name;
+ $scope.vm.companyManager = result[0].manager;
+ $scope.vm.companyTel = result[0].tel;
+ $scope.vm.companyEmail = result[0].email;
+ $scope.vm.companyUrl = result[0].url;
+ $scope.vm.companyMemo = result[0].memo;
+ $scope.vm.form.companyTypeId = result[0].companyTypeId;
+ $scope.vm.form.parentSectorId = result[0].parentSectorId;
+ $scope.vm.form.childSectorId = result[0].childSectorId;
+ $scope.vm.form.regionId = result[0].regionId;
+ $scope.vm.form.statusId = result[0].statusId;
+ $scope.vm.form.companyType = result[0].companyTypeName;
+ $scope.vm.form.parentSector = result[0].parentSectorName;
+ $scope.vm.form.childSector = result[0].childSectorName;
+ $scope.vm.form.region = result[0].regionName;
+ $scope.vm.form.status = result[0].statusName;
- $scope.vm.ispId = "";
- $scope.vm.ispName = "";
- $scope.vm.ispCode = "";
- $scope.vm.ispManager = "";
- $scope.vm.ispTel = "";
- $scope.vm.ispEmail = "";
- $scope.vm.ispUrl = "";
- $scope.vm.ispMemo = "";
+ $scope.vm.ispId = "";
+ $scope.vm.ispName = "";
+ $scope.vm.ispCode = "";
+ $scope.vm.ispManager = "";
+ $scope.vm.ispTel = "";
+ $scope.vm.ispEmail = "";
+ $scope.vm.ispUrl = "";
+ $scope.vm.ispMemo = "";
- $scope.vm.hostingId = "";
- $scope.vm.hostingName = "";
- $scope.vm.hostingCode = "";
- $scope.vm.hostingManager = "";
- $scope.vm.hostingTel = "";
- $scope.vm.hostingEmail = "";
- $scope.vm.hostingUrl = "";
- $scope.vm.hostingMemo = "";
+ $scope.vm.hostingId = "";
+ $scope.vm.hostingName = "";
+ $scope.vm.hostingCode = "";
+ $scope.vm.hostingManager = "";
+ $scope.vm.hostingTel = "";
+ $scope.vm.hostingEmail = "";
+ $scope.vm.hostingUrl = "";
+ $scope.vm.hostingMemo = "";
- if (ispFieldVo != null){
- $scope.vm.ispId = ispFieldVo.id;
- $scope.vm.ispName = ispFieldVo.name;
- $scope.vm.ispCode = ispFieldVo.code;
- $scope.vm.ispManager = ispFieldVo.manager;
- $scope.vm.ispTel = ispFieldVo.tel;
- $scope.vm.ispEmail = ispFieldVo.email;
- $scope.vm.ispUrl = ispFieldVo.url;
- $scope.vm.ispMemo = ispFieldVo.memo;
- }
- if (hostingFieldVo != null){
- $scope.vm.hostingId = hostingFieldVo.id;
- $scope.vm.hostingName = hostingFieldVo.name;
- $scope.vm.hostingCode = hostingFieldVo.code;
- $scope.vm.hostingManager = hostingFieldVo.manager;
- $scope.vm.hostingTel = hostingFieldVo.tel;
- $scope.vm.hostingEmail = hostingFieldVo.email;
- $scope.vm.hostingUrl = hostingFieldVo.url;
- $scope.vm.hostingMemo = hostingFieldVo.memo;
+ if (ispFieldVo != null) {
+ $scope.vm.ispId = ispFieldVo.id;
+ $scope.vm.ispName = ispFieldVo.name;
+ $scope.vm.ispCode = ispFieldVo.code;
+ $scope.vm.ispManager = ispFieldVo.manager;
+ $scope.vm.ispTel = ispFieldVo.tel;
+ $scope.vm.ispEmail = ispFieldVo.email;
+ $scope.vm.ispUrl = ispFieldVo.url;
+ $scope.vm.ispMemo = ispFieldVo.memo;
+ }
+ if (hostingFieldVo != null) {
+ $scope.vm.hostingId = hostingFieldVo.id;
+ $scope.vm.hostingName = hostingFieldVo.name;
+ $scope.vm.hostingCode = hostingFieldVo.code;
+ $scope.vm.hostingManager = hostingFieldVo.manager;
+ $scope.vm.hostingTel = hostingFieldVo.tel;
+ $scope.vm.hostingEmail = hostingFieldVo.email;
+ $scope.vm.hostingUrl = hostingFieldVo.url;
+ $scope.vm.hostingMemo = hostingFieldVo.memo;
+ }
}
});
// ISP�젙蹂� 寃곌낵 媛� Event 泥섎━(set)
$scope.$on("ispFieldEvent", function (event, result) {
- $scope.vm.ispId = result[0].id;
- $scope.vm.ispName = result[0].name;
- $scope.vm.ispCode = result[0].code;
- $scope.vm.ispManager = result[0].manager;
- $scope.vm.ispTel = result[0].tel;
- $scope.vm.ispEmail = result[0].email;
- $scope.vm.ispUrl = result[0].url;
- $scope.vm.ispMemo = result[0].memo;
+ if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) {
+ $scope.vm.ispId = result[0].id;
+ $scope.vm.ispName = result[0].name;
+ $scope.vm.ispCode = result[0].code;
+ $scope.vm.ispManager = result[0].manager;
+ $scope.vm.ispTel = result[0].tel;
+ $scope.vm.ispEmail = result[0].email;
+ $scope.vm.ispUrl = result[0].url;
+ $scope.vm.ispMemo = result[0].memo;
+ }
});
// �샇�뒪�똿�젙蹂� 寃곌낵 媛� Event 泥섎━(set)
$scope.$on("hostingFieldEvent", function (event, result) {
- $scope.vm.hostingId = result[0].id;
- $scope.vm.hostingName = result[0].name;
- $scope.vm.hostingCode = result[0].code;
- $scope.vm.hostingManager = result[0].manager;
- $scope.vm.hostingTel = result[0].tel;
- $scope.vm.hostingEmail = result[0].email;
- $scope.vm.hostingUrl = result[0].url;
- $scope.vm.hostingMemo = result[0].memo;
+ if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) {
+ $scope.vm.hostingId = result[0].id;
+ $scope.vm.hostingName = result[0].name;
+ $scope.vm.hostingCode = result[0].code;
+ $scope.vm.hostingManager = result[0].manager;
+ $scope.vm.hostingTel = result[0].tel;
+ $scope.vm.hostingEmail = result[0].email;
+ $scope.vm.hostingUrl = result[0].url;
+ $scope.vm.hostingMemo = result[0].memo;
+ }
+ });
+
+ $scope.$on("companyTypeEvent", function (event, result) {
+ if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) {
+ $scope.vm.form.companyTypeId = result[0].id;
+ }
+ });
+ $scope.$on("parentSectorEvent", function (event, result) {
+ if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) {
+ $scope.vm.form.parentSectorId = result[0].id;
+ } else {
+ $scope.vm.form.parentSectorId = "";
+ if ($rootScope.isDefined($scope.vm.form.parentSectors) && $rootScope.isDefined($scope.vm.form.parentSectors[0])) {
+ $scope.vm.form.parentSectors[0].id = "";
+ }
+ }
+ $scope.vm.form.childSectorId = "";
+ $scope.vm.form.childSector = "";
+ $scope.vm.form.childSectors = [];
+ });
+ $scope.$on("childSectorEvent", function (event, result) {
+ if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) {
+ $scope.vm.form.childSectorId = result[0].id;
+ }
+ });
+ $scope.$on("regionEvent", function (event, result) {
+ if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) {
+ $scope.vm.form.regionId = result[0].id;
+ }
+ });
+ $scope.$on("statusEvent", function (event, result) {
+ if ($rootScope.isDefined(result) && $rootScope.isDefined(result[0])) {
+ $scope.vm.form.statusId = result[0].id;
+ }
});
// �뤌 �쟾�넚
@@ -473,6 +597,44 @@
companyEmail :$scope.vm.companyEmail,
companyUrl : $scope.vm.companyUrl,
companyMemo : $scope.vm.companyMemo,
+ companyTypeId : (function () {
+ var companyTypeId = -1;
+ if ($scope.vm.form.companyTypes != null && $scope.vm.form.companyTypes.length > 0) {
+ companyTypeId = $scope.vm.form.companyTypes[0].id;
+ }
+ return companyTypeId;
+ })(),
+ parentSectorId : (function () {
+ var parentSectorId = -1;
+ if ($scope.vm.form.parentSectors != null && $scope.vm.form.parentSectors.length > 0) {
+ parentSectorId = $scope.vm.form.parentSectors[0].id;
+ }
+ return parentSectorId;
+ })(),
+ childSectorId : (function () {
+ var childSectorId = -1;
+ if ($scope.vm.form.childSectors != null && $scope.vm.form.childSectors.length > 0) {
+ childSectorId = $scope.vm.form.childSectors[0].id;
+ }
+ return childSectorId;
+ })(),
+ regionId : (function () {
+ var regionId = -1;
+ if ($scope.vm.form.regions != null && $scope.vm.form.regions.length > 0) {
+ regionId = $scope.vm.form.regions[0].id;
+ }
+ return regionId;
+ })(),
+ statusId : (function () {
+ var statusId = -1;
+ if ($scope.vm.form.statuses != null && $scope.vm.form.statuses.length > 0) {
+ statusId = $scope.vm.form.statuses[0].id;
+ } else if ($scope.vm.form.status !== ""){
+ statusId = 120; //吏곸젒�엯�젰 �씪 寃쎌슦
+ }
+ return statusId;
+ })(),
+ statusName : $scope.vm.form.status,
ispName : $scope.vm.ispName,
ispCode : $scope.vm.ispCode,
ispManager : $scope.vm.ispManager,
@@ -505,31 +667,33 @@
companyId : (function () {
var companyId = -1;
-
- if ($scope.vm.form.issueCompanyFields.length > 0) {
+ if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0) {
companyId = $scope.vm.form.issueCompanyFields[0].id;
}
-
return companyId;
}),
ispId : (function () {
var ispId = -1;
-
- if ($scope.vm.form.issueIspFields.length > 0) {
+ if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0) {
+ if ($scope.vm.form.issueCompanyFields[0].ispId != null){
+ ispId = $scope.vm.form.issueCompanyFields[0].ispId;
+ }
+ }else if ($scope.vm.form.issueIspFields != null && $scope.vm.form.issueIspFields.length > 0) {
ispId = $scope.vm.form.issueIspFields[0].id;
}
-
return ispId;
}),
hostingId : (function () {
var hostingId = -1;
-
- if ($scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0) {
+ if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0) {
+ if ($scope.vm.form.issueCompanyFields[0].hostingId != null){
+ hostingId = $scope.vm.form.issueCompanyFields[0].hostingId;
+ }
+ }else if ($scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0) {
hostingId = $scope.vm.form.issueHostingFields[0].id;
}
-
return hostingId;
}),
@@ -570,14 +734,19 @@
var companyField = $scope.vm.form.issueCompanyFields[0];
issueCompanyFields.push({
- id : companyField.id,
companyId : $scope.vm.companyId,
name : $scope.vm.companyName,
manager : $scope.vm.companyManager,
tel : $scope.vm.companyTel,
email :$scope.vm.companyEmail,
url :$scope.vm.companyUrl,
- memo : $scope.vm.companyMemo
+ memo : $scope.vm.companyMemo,
+ companyTypeId : $scope.vm.form.companyTypeId,
+ parentSectorId : $scope.vm.form.parentSectorId,
+ childSectorId : $scope.vm.form.childSectorId,
+ regionId : $scope.vm.form.regionId,
+ statusId : $scope.vm.form.statusId,
+ statusName : $scope.vm.form.status
});
}
@@ -586,11 +755,10 @@
issueIspFields : (function () {
var issueIspFields = [];
- if ($scope.vm.form.issueIspFields != null && $scope.vm.form.issueIspFields.length > 0 ){
- var ispField = $scope.vm.form.issueIspFields[0];
-
+ if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0
+ && $scope.vm.form.issueCompanyFields[0].ispFieldVo != null
+ || $scope.vm.form.issueIspFields != null && $scope.vm.form.issueIspFields.length > 0 ){
issueIspFields.push({
- id : ispField.id,
ispId : $scope.vm.ispId,
code : $scope.vm.ispCode,
name : $scope.vm.ispName,
@@ -608,12 +776,10 @@
issueHostingFields : (function () {
var issueHostingFields = [];
- if ($scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0 ){
-
- var hostingField = $scope.vm.form.issueHostingFields[0];
-
+ if ($scope.vm.form.issueCompanyFields != null && $scope.vm.form.issueCompanyFields.length > 0
+ && $scope.vm.form.issueCompanyFields[0].hostingFieldVo != null
+ || $scope.vm.form.issueHostingFields != null && $scope.vm.form.issueHostingFields.length > 0 ){
issueHostingFields.push({
- id : hostingField.id,
hostingId : $scope.vm.hostingId,
name : $scope.vm.hostingName,
code : $scope.vm.hostingCode,
@@ -679,8 +845,6 @@
if (result.data.message.status === "success") {
$scope.fn.addDownIssue(result.data.data);
- $scope.fn.cancel();
-
// �씠�뒋 �긽�꽭 �솕硫� �슂泥�
$rootScope.$broadcast("getIssueDetail", {
id : parameter.id
@@ -695,36 +859,84 @@
});
}
- // �뿰愿� �씠�뒋 異붽�
- 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(issueVo) {
+ $rootScope.spinner = true;
+ let inheritYn = issueVo.inheritPartners;
+ let usePartner = issueVo.usePartner;
- var contents = {
- //relationIssueType : $scope.vm.form.relationIssueTypeId,
- // issueId : $rootScope.currentDetailIssueId,
- issueId : parameter.id,
- id : downId,
- parentIssueId : parameter.id
- };
+ var ids = [];
+ if (issueVo.id != null) {
+ ids.push(issueVo.id);
+ }
- Issue.modifyParentIssue($resourceProvider.getContent(
- contents,
- $resourceProvider.getPageContent(0, 10))).then(function (result) {
+ if ($rootScope.isDefined(usePartner) && usePartner > 0
+ && $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;
+ }
- if (result.data.message.status === "success") {
- // �씠�뒋 �긽�꽭 �솕硫� �슂泥�
- $rootScope.$broadcast("getIssueDetail", {
- id : parameter.id
+ 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") {
+ $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") {
+ $scope.fn.cancel();
+ // �씠�뒋 �긽�꽭 �솕硫� �슂泥�
+ $rootScope.$broadcast("getIssueDetail", {
+ id : parameter.id
+ });
+ }
+ else {
+ SweetAlert.error($filter("translate")("issue.failedToIssueAddIssueDown"), result.data.message.message); // "�븯�쐞�씠�뒋 �깮�꽦 �떎�뙣"
+ }
+ });
+ }
}
// �뙘�뾽 李� �떕湲�
@@ -947,12 +1159,19 @@
$scope.vm.projectName = $rootScope.workProject.name;
$scope.vm.form.projects = [];
$scope.vm.form.projects.push($rootScope.workProject);
+ } else {
+ $scope.vm.projectName = parameter.project.name;
+ $scope.vm.form.projects.push(parameter.project);
}
// �쁽�옱 �씠�뒋���엯 �쑀�삎 �꽕�젙
var id = $rootScope.getCurrentIssueTypeId();
if (id != null) {
$scope.vm.form.issueTypeId = id.toString();
+ } else {
+ $scope.vm.form.issueTypeId = parameter.issueTypeId.toString();
}
+ // �씠�뒋�쑀�삎, �봽濡쒖젥�듃 set �븳 �썑�뿉 �궗�슜�옄�젙�쓽�븘�뱶 set
+ $scope.fn.getIssueTypeCustomFields();
$log.debug("promises 寃곌낵 ", results);
});
}
--
Gitblit v1.8.0