From b1cdf12a481f525768758a8d50108ca310f1a26f Mon Sep 17 00:00:00 2001 From: Jay07GIT Date: Thu, 26 Sep 2024 16:10:27 +0530 Subject: [PATCH 1/3] fix for undefined recordSetGroupChange --- .../public/lib/controllers/controller.records.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/portal/public/lib/controllers/controller.records.js b/modules/portal/public/lib/controllers/controller.records.js index 9b2c3121a..152fe9fbf 100644 --- a/modules/portal/public/lib/controllers/controller.records.js +++ b/modules/portal/public/lib/controllers/controller.records.js @@ -179,6 +179,11 @@ angular.module('controller.records', []) $scope.editRecord = function(record) { $scope.currentRecord = angular.copy(record); $scope.currentRecord.recordSetGroupChange = angular.copy(record.recordSetGroupChange); + if ($scope.currentRecord.recordSetGroupChange == undefined){ + $scope.currentRecord.recordSetGroupChange = {} + $scope.currentRecord.recordSetGroupChange.requestedOwnerGroupId = angular.copy(record.ownerGroupId); + $scope.currentRecord.recordSetGroupChange.ownerShipTransferStatus = angular.copy("AutoApproved"); + } getGroup($scope.currentRecord.recordSetGroupChange.requestedOwnerGroupId); $scope.recordModal = { previous: angular.copy(record), @@ -212,6 +217,11 @@ angular.module('controller.records', []) $scope.requestOwnerShipTransfer = function(record, isOwnerShipRequest) { $scope.currentRecord = angular.copy(record); $scope.currentRecord.recordSetGroupChange = angular.copy(record.recordSetGroupChange); + if ($scope.currentRecord.recordSetGroupChange == undefined){ + $scope.currentRecord.recordSetGroupChange = {} + $scope.currentRecord.recordSetGroupChange.requestedOwnerGroupId = angular.copy(record.ownerGroupId); + $scope.currentRecord.recordSetGroupChange.ownerShipTransferStatus = angular.copy("AutoApproved"); + } $scope.recordModal = { previous: angular.copy(record), action: $scope.recordModalState.UPDATE, From 41e3beff8d369422bf17db5c3a7baf156fe6d649 Mon Sep 17 00:00:00 2001 From: Jay07GIT Date: Thu, 10 Oct 2024 23:49:35 +0530 Subject: [PATCH 2/3] update --- .../public/lib/controllers/controller.records.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/modules/portal/public/lib/controllers/controller.records.js b/modules/portal/public/lib/controllers/controller.records.js index 152fe9fbf..9288bc2e4 100644 --- a/modules/portal/public/lib/controllers/controller.records.js +++ b/modules/portal/public/lib/controllers/controller.records.js @@ -178,7 +178,6 @@ angular.module('controller.records', []) $scope.editRecord = function(record) { $scope.currentRecord = angular.copy(record); - $scope.currentRecord.recordSetGroupChange = angular.copy(record.recordSetGroupChange); if ($scope.currentRecord.recordSetGroupChange == undefined){ $scope.currentRecord.recordSetGroupChange = {} $scope.currentRecord.recordSetGroupChange.requestedOwnerGroupId = angular.copy(record.ownerGroupId); @@ -200,7 +199,13 @@ angular.module('controller.records', []) $scope.requestOwnerShip = function(record) { $scope.currentRecord = angular.copy(record); - $scope.currentRecord.recordSetGroupChange.ownerShipTransferStatus = angular.copy("AutoApproved") + if ($scope.currentRecord.recordSetGroupChange == undefined){ + $scope.currentRecord.recordSetGroupChange = {} + $scope.currentRecord.recordSetGroupChange.requestedOwnerGroupId = angular.copy(record.ownerGroupId); + $scope.currentRecord.recordSetGroupChange.ownerShipTransferStatus = angular.copy("AutoApproved"); + } + $scope.currentRecord.recordSetGroupChange.ownerShipTransferStatus = angular.copy("AutoApproved") + $scope.recordModal = { action: $scope.recordModalState.UPDATE, title: "Request OwnerShip transfer", @@ -216,12 +221,13 @@ angular.module('controller.records', []) $scope.requestOwnerShipTransfer = function(record, isOwnerShipRequest) { $scope.currentRecord = angular.copy(record); - $scope.currentRecord.recordSetGroupChange = angular.copy(record.recordSetGroupChange); if ($scope.currentRecord.recordSetGroupChange == undefined){ $scope.currentRecord.recordSetGroupChange = {} $scope.currentRecord.recordSetGroupChange.requestedOwnerGroupId = angular.copy(record.ownerGroupId); $scope.currentRecord.recordSetGroupChange.ownerShipTransferStatus = angular.copy("AutoApproved"); } + $scope.currentRecord.recordSetGroupChange = angular.copy(record.recordSetGroupChange); + $scope.recordModal = { previous: angular.copy(record), action: $scope.recordModalState.UPDATE, @@ -322,13 +328,13 @@ angular.module('controller.records', []) }; $scope.submitUpdateRecord = function () { - var record = angular.copy($scope.currentRecord); + var record = angular.copy($scope.currentRecord) if(record.recordSetGroupChange.requestedOwnerGroupId != undefined){ if (record.ownerGroupId != $scope.recordModal.previous.ownerGroupId && $scope.isZoneAdmin){ record.recordSetGroupChange.requestedOwnerGroupId = angular.copy(record.ownerGroupId); record.recordSetGroupChange.ownerShipTransferStatus = angular.copy("ManuallyApproved"); } - } + } else {record.recordSetGroupChange.requestedOwnerGroupId = angular.copy(record.ownerGroupId);} record['onlyFour'] = true; if ($scope.addRecordForm.$valid) { updateRecordSet(record); From efc4e3f0a549a3ce2832bdfc10f8b45ba00c8b91 Mon Sep 17 00:00:00 2001 From: Jay07GIT Date: Thu, 10 Oct 2024 23:52:27 +0530 Subject: [PATCH 3/3] update --- .../lib/controllers/controller.records.js | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/modules/portal/public/lib/controllers/controller.records.js b/modules/portal/public/lib/controllers/controller.records.js index 9288bc2e4..ae7d3e3ee 100644 --- a/modules/portal/public/lib/controllers/controller.records.js +++ b/modules/portal/public/lib/controllers/controller.records.js @@ -179,9 +179,9 @@ angular.module('controller.records', []) $scope.editRecord = function(record) { $scope.currentRecord = angular.copy(record); if ($scope.currentRecord.recordSetGroupChange == undefined){ - $scope.currentRecord.recordSetGroupChange = {} - $scope.currentRecord.recordSetGroupChange.requestedOwnerGroupId = angular.copy(record.ownerGroupId); - $scope.currentRecord.recordSetGroupChange.ownerShipTransferStatus = angular.copy("AutoApproved"); + $scope.currentRecord.recordSetGroupChange = {} + $scope.currentRecord.recordSetGroupChange.requestedOwnerGroupId = angular.copy(record.ownerGroupId); + $scope.currentRecord.recordSetGroupChange.ownerShipTransferStatus = angular.copy("AutoApproved"); } getGroup($scope.currentRecord.recordSetGroupChange.requestedOwnerGroupId); $scope.recordModal = { @@ -200,12 +200,11 @@ angular.module('controller.records', []) $scope.requestOwnerShip = function(record) { $scope.currentRecord = angular.copy(record); if ($scope.currentRecord.recordSetGroupChange == undefined){ - $scope.currentRecord.recordSetGroupChange = {} - $scope.currentRecord.recordSetGroupChange.requestedOwnerGroupId = angular.copy(record.ownerGroupId); - $scope.currentRecord.recordSetGroupChange.ownerShipTransferStatus = angular.copy("AutoApproved"); - } - $scope.currentRecord.recordSetGroupChange.ownerShipTransferStatus = angular.copy("AutoApproved") - + $scope.currentRecord.recordSetGroupChange = {} + $scope.currentRecord.recordSetGroupChange.requestedOwnerGroupId = angular.copy(record.ownerGroupId); + $scope.currentRecord.recordSetGroupChange.ownerShipTransferStatus = angular.copy("AutoApproved"); + } + $scope.currentRecord.recordSetGroupChange.ownerShipTransferStatus = angular.copy("AutoApproved"); $scope.recordModal = { action: $scope.recordModalState.UPDATE, title: "Request OwnerShip transfer", @@ -222,12 +221,11 @@ angular.module('controller.records', []) $scope.requestOwnerShipTransfer = function(record, isOwnerShipRequest) { $scope.currentRecord = angular.copy(record); if ($scope.currentRecord.recordSetGroupChange == undefined){ - $scope.currentRecord.recordSetGroupChange = {} - $scope.currentRecord.recordSetGroupChange.requestedOwnerGroupId = angular.copy(record.ownerGroupId); - $scope.currentRecord.recordSetGroupChange.ownerShipTransferStatus = angular.copy("AutoApproved"); - } - $scope.currentRecord.recordSetGroupChange = angular.copy(record.recordSetGroupChange); - + $scope.currentRecord.recordSetGroupChange = {} + $scope.currentRecord.recordSetGroupChange.requestedOwnerGroupId = angular.copy(record.ownerGroupId); + $scope.currentRecord.recordSetGroupChange.ownerShipTransferStatus = angular.copy("AutoApproved"); + } + $scope.currentRecord.recordSetGroupChange = angular.copy(record.recordSetGroupChange); $scope.recordModal = { previous: angular.copy(record), action: $scope.recordModalState.UPDATE, @@ -328,7 +326,7 @@ angular.module('controller.records', []) }; $scope.submitUpdateRecord = function () { - var record = angular.copy($scope.currentRecord) + var record = angular.copy($scope.currentRecord); if(record.recordSetGroupChange.requestedOwnerGroupId != undefined){ if (record.ownerGroupId != $scope.recordModal.previous.ownerGroupId && $scope.isZoneAdmin){ record.recordSetGroupChange.requestedOwnerGroupId = angular.copy(record.ownerGroupId);