diff -Nru horizon-23.1.0/debian/changelog horizon-23.1.0/debian/changelog --- horizon-23.1.0/debian/changelog 2023-03-24 12:31:56.000000000 +0000 +++ horizon-23.1.0/debian/changelog 2023-03-24 13:38:00.000000000 +0000 @@ -1,14 +1,16 @@ -horizon (4:23.1.0-0ubuntu1~bpo23.04.1~ppa202303240831) lunar; urgency=medium +horizon (4:23.1.0-0ubuntu1~bpo23.04.1~ppa202303240937) lunar; urgency=medium * No-change backport to lunar. - -- Corey Bryant Fri, 24 Mar 2023 08:31:56 -0400 + -- Corey Bryant Fri, 24 Mar 2023 09:38:00 -0400 horizon (4:23.1.0-0ubuntu1) lunar; urgency=medium * New upstream release for OpenStack Antelope. * Refresh xstatic assets. * d/control: Align (Build-)Depends with upstream. + * d/p/fix-swift-allow-object-creation.patch: Cherry-picked from + upstream to fix swift uploads (LP: #1993005). -- Corey Bryant Fri, 24 Mar 2023 08:28:10 -0400 diff -Nru horizon-23.1.0/debian/patches/fix-swift-allow-object-creation.patch horizon-23.1.0/debian/patches/fix-swift-allow-object-creation.patch --- horizon-23.1.0/debian/patches/fix-swift-allow-object-creation.patch 1970-01-01 00:00:00.000000000 +0000 +++ horizon-23.1.0/debian/patches/fix-swift-allow-object-creation.patch 2023-03-24 12:28:10.000000000 +0000 @@ -0,0 +1,48 @@ +From a327842a25f904397be0c3c141ada1f9ac8050cd Mon Sep 17 00:00:00 2001 +From: Mohammed Naser +Date: Sun, 19 Feb 2023 18:47:11 +0000 +Subject: [PATCH] fix(swift): allow object creation + +It is currently not possible to create any new objects inside +Swift as you'd always get an error that the new object name +already exists all the time. + +This fixes that issue and enables you to upload files again. + +Closes-Bug: #1993005 +Related-Change-Id: Idfb90a327e94ccaa3263aaaad1d6d52fa46312f4 +Change-Id: Ib2f1aaae87820e8d5c4a6c9b01b6a6e9a5552952 +--- + .../static/app/core/openstack-service-api/swift.service.js | 3 +-- + .../app/core/openstack-service-api/swift.service.spec.js | 1 - + 2 files changed, 1 insertion(+), 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(); + }); + +-- +2.39.2 + diff -Nru horizon-23.1.0/debian/patches/series horizon-23.1.0/debian/patches/series --- horizon-23.1.0/debian/patches/series 2023-03-24 12:28:10.000000000 +0000 +++ horizon-23.1.0/debian/patches/series 2023-03-24 12:28:10.000000000 +0000 @@ -3,3 +3,4 @@ ubuntu_settings.patch embedded-xstatic.patch django-4-fix-csrf-reasons-list.patch +fix-swift-allow-object-creation.patch