mirror of
https://github.com/VinylDNS/vinyldns
synced 2025-08-22 02:02:14 +00:00
Merge pull request #1397 from Jay07GIT/fix_recordSetGroupChange_undefined
Fix for undefined recordSetGroupChange
This commit is contained in:
commit
a363d6974b
@ -191,7 +191,11 @@ angular.module('controller.records', [])
|
|||||||
|
|
||||||
$scope.editRecord = function(record) {
|
$scope.editRecord = function(record) {
|
||||||
$scope.currentRecord = angular.copy(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);
|
getGroup($scope.currentRecord.recordSetGroupChange.requestedOwnerGroupId);
|
||||||
$scope.recordModal = {
|
$scope.recordModal = {
|
||||||
previous: angular.copy(record),
|
previous: angular.copy(record),
|
||||||
@ -208,7 +212,12 @@ angular.module('controller.records', [])
|
|||||||
|
|
||||||
$scope.requestOwnerShip = function(record) {
|
$scope.requestOwnerShip = function(record) {
|
||||||
$scope.currentRecord = angular.copy(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 = {
|
$scope.recordModal = {
|
||||||
action: $scope.recordModalState.UPDATE,
|
action: $scope.recordModalState.UPDATE,
|
||||||
title: "Request OwnerShip transfer",
|
title: "Request OwnerShip transfer",
|
||||||
@ -224,6 +233,11 @@ angular.module('controller.records', [])
|
|||||||
|
|
||||||
$scope.requestOwnerShipTransfer = function(record, isOwnerShipRequest) {
|
$scope.requestOwnerShipTransfer = function(record, isOwnerShipRequest) {
|
||||||
$scope.currentRecord = angular.copy(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 = angular.copy(record.recordSetGroupChange);
|
$scope.currentRecord.recordSetGroupChange = angular.copy(record.recordSetGroupChange);
|
||||||
$scope.recordModal = {
|
$scope.recordModal = {
|
||||||
previous: angular.copy(record),
|
previous: angular.copy(record),
|
||||||
@ -331,7 +345,7 @@ angular.module('controller.records', [])
|
|||||||
record.recordSetGroupChange.requestedOwnerGroupId = angular.copy(record.ownerGroupId);
|
record.recordSetGroupChange.requestedOwnerGroupId = angular.copy(record.ownerGroupId);
|
||||||
record.recordSetGroupChange.ownerShipTransferStatus = angular.copy("ManuallyApproved");
|
record.recordSetGroupChange.ownerShipTransferStatus = angular.copy("ManuallyApproved");
|
||||||
}
|
}
|
||||||
}
|
} else {record.recordSetGroupChange.requestedOwnerGroupId = angular.copy(record.ownerGroupId);}
|
||||||
record['onlyFour'] = true;
|
record['onlyFour'] = true;
|
||||||
if ($scope.addRecordForm.$valid) {
|
if ($scope.addRecordForm.$valid) {
|
||||||
updateRecordSet(record);
|
updateRecordSet(record);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user