summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-03-23 22:53:38 +0000
committerGerrit Code Review <review@openstack.org>2023-03-23 22:53:38 +0000
commit76650bbfa7ff3669bde8fdd71f370b66a6be900e (patch)
tree382a67dddfa3589f8fd2534d804c7988e8fcef75
parentc88583e33a2b3175c6befed16ecacfe66a04ff91 (diff)
parenta327842a25f904397be0c3c141ada1f9ac8050cd (diff)
downloadhorizon-76650bbfa7ff3669bde8fdd71f370b66a6be900e.tar.gz
Merge "fix(swift): allow object creation"
-rw-r--r--openstack_dashboard/static/app/core/openstack-service-api/swift.service.js3
-rw-r--r--openstack_dashboard/static/app/core/openstack-service-api/swift.service.spec.js1
2 files changed, 1 insertions, 3 deletions
diff --git a/openstack_dashboard/static/app/core/openstack-service-api/swift.service.js b/openstack_dashboard/static/app/core/openstack-service-api/swift.service.js
index b2b170efe..daafd8ead 100644
--- a/openstack_dashboard/static/app/core/openstack-service-api/swift.service.js
+++ b/openstack_dashboard/static/app/core/openstack-service-api/swift.service.js
@@ -296,8 +296,7 @@
service.getObjectURL(container, objectName, 'metadata')
);
if (ignoreError) {
- // provide a noop error handler so the error is ignored
- return promise.catch(angular.noop);
+ return promise;
}
return promise.catch(function onError() {
toastService.add('error', gettext('Unable to get details of the object.'));
diff --git a/openstack_dashboard/static/app/core/openstack-service-api/swift.service.spec.js b/openstack_dashboard/static/app/core/openstack-service-api/swift.service.spec.js
index 40ec0002d..06a64908d 100644
--- a/openstack_dashboard/static/app/core/openstack-service-api/swift.service.spec.js
+++ b/openstack_dashboard/static/app/core/openstack-service-api/swift.service.spec.js
@@ -256,7 +256,6 @@
spyOn(promise, 'catch');
spyOn(toastService, 'add');
service.getObjectDetails('spam', 'ham', true);
- expect(promise.catch).toHaveBeenCalledWith(angular.noop);
expect(toastService.add).not.toHaveBeenCalled();
});