From b009c6b4a07a184e5ef489c876b86fc29b5b8494 Mon Sep 17 00:00:00 2001 From: Martin Hradil Date: Wed, 27 Oct 2021 18:00:17 +0000 Subject: [PATCH 1/2] EE repositories url - allow for dot in container name Issue: AAH-1049 --- galaxy_ng/app/api/ui/urls.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/galaxy_ng/app/api/ui/urls.py b/galaxy_ng/app/api/ui/urls.py index d00e0bc171..54d555335b 100644 --- a/galaxy_ng/app/api/ui/urls.py +++ b/galaxy_ng/app/api/ui/urls.py @@ -103,12 +103,12 @@ # under _content prevents cases where an image could be named foo/images # and conflict with our URL paths. re_path( - r'repositories/(?P[-\w]+\/{0,1}[-\w]+)/_content/', + r'repositories/(?P[-\w.]+\/{0,1}[-\w.]+)/_content/', include(container_repo_paths)), # This regex can capture "namespace/name" and "name" re_path( - r"repositories/(?P[-\w]+\/{0,1}[-\w]+)/", + r"repositories/(?P[-\w.]+\/{0,1}[-\w.]+)/", viewsets.ContainerRepositoryViewSet.as_view({"get": "retrieve", "delete": "destroy"}), name="container-repository-detail", ), From f56aac5e6e081660d1fd48023a46c7d80de84f9d Mon Sep 17 00:00:00 2001 From: Martin Hradil Date: Wed, 27 Oct 2021 18:06:30 +0000 Subject: [PATCH 2/2] CHANGES --- CHANGES/1049.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 CHANGES/1049.bugfix diff --git a/CHANGES/1049.bugfix b/CHANGES/1049.bugfix new file mode 100644 index 0000000000..7ed3121789 --- /dev/null +++ b/CHANGES/1049.bugfix @@ -0,0 +1 @@ +Allow deleting execution environment repositories with a dot in name