openstack/horizon
Code Issues Proposed changes

Merge "Fix problem with activate/deactivate image" into stable/2025.1

Browse Source
This commit is contained in:
Zuul
2025-04-24 09:29:06 +00:00
committed by Gerrit Code Review
parent 630c3dcc06 727e1c2847
commit 992be9d119
2 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
openstack_dashboard/static/app/core/images/actions/deactivate-image.service.js
View File

@@ -73,10 +73,11 @@
submit: context.labels.submit
};
outcome = simpleModal.modal(modalParams).result
.then(deactivateImage(image))
.then(function () {
return deactivateImage(image);
})
.then(
function() { return onDeactivateImageSuccess(image); },
function() { return onDeactivateImageFail(image); }
function() { return onDeactivateImageSuccess(image); }
);
}
return outcome;
@@ -98,13 +99,6 @@
.result;
}
function onDeactivateImageFail(image) {
toast.add('error', interpolate(labelize().error, [image.name]));
return actionResultService.getActionResult()
.failed(imagesResourceType, image.id)
.result;
}
function labelize() {
return {
title: gettext('Confirm Deactivate Image'),

14
openstack_dashboard/static/app/core/images/actions/reactivate-image.service.js
View File

@@ -73,10 +73,11 @@
submit: context.labels.submit
};
outcome = simpleModal.modal(modalParams).result
.then(reactivateImage(image))
.then(function () {
return reactivateImage(image);
})
.then(
function() { return onReactivateImageSuccess(image); },
function() { return onReactivateImageFail(image); }
function() { return onReactivateImageSuccess(image); }
);
}
return outcome;
@@ -97,13 +98,6 @@
.result;
}
function onReactivateImageFail(image) {
toast.add('error', interpolate(labelize().error, [image.name]));
return actionResultService.getActionResult()
.failed(imagesResourceType, image.id)
.result;
}
function labelize() {
return {
title: gettext('Confirm Reactivate Image'),