From 4377d1e86e17eb634df1cc0f0ba54da48f5b542f Mon Sep 17 00:00:00 2001
From: Jens Langhammer <jens.langhammer@beryju.org>
Date: Wed, 20 May 2020 16:09:53 +0200
Subject: [PATCH] admin: fix flow ordering, fix source URLs

---
 passbook/admin/templates/administration/base.html | 2 +-
 passbook/admin/urls.py                            | 4 ++--
 passbook/admin/views/stages_bindings.py           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/passbook/admin/templates/administration/base.html b/passbook/admin/templates/administration/base.html
index 72a316a5f..85ab74d15 100644
--- a/passbook/admin/templates/administration/base.html
+++ b/passbook/admin/templates/administration/base.html
@@ -94,7 +94,7 @@
                     </section>
                 </li>
                 <li class="pf-c-nav__item pf-m-expandable pf-m-expanded">
-                    <a href="#" class="pf-c-nav__link" aria-expanded="true">{% trans 'Policies and Bindings' %}
+                    <a href="#" class="pf-c-nav__link" aria-expanded="true">{% trans 'Policies' %}
                         <span class="pf-c-nav__toggle">
                             <i class="fas fa-angle-right" aria-hidden="true"></i>
                         </span>
diff --git a/passbook/admin/urls.py b/passbook/admin/urls.py
index a854229f8..b025e6947 100644
--- a/passbook/admin/urls.py
+++ b/passbook/admin/urls.py
@@ -46,12 +46,12 @@ urlpatterns = [
     path("sources/", sources.SourceListView.as_view(), name="sources"),
     path("sources/create/", sources.SourceCreateView.as_view(), name="source-create"),
     path(
-        "sources/<int:pk>/update/",
+        "sources/<uuid:pk>/update/",
         sources.SourceUpdateView.as_view(),
         name="source-update",
     ),
     path(
-        "sources/<int:pk>/delete/",
+        "sources/<uuid:pk>/delete/",
         sources.SourceDeleteView.as_view(),
         name="source-delete",
     ),
diff --git a/passbook/admin/views/stages_bindings.py b/passbook/admin/views/stages_bindings.py
index 67d00be44..65433a179 100644
--- a/passbook/admin/views/stages_bindings.py
+++ b/passbook/admin/views/stages_bindings.py
@@ -21,7 +21,7 @@ class StageBindingListView(LoginRequiredMixin, PermissionListMixin, ListView):
     model = FlowStageBinding
     permission_required = "passbook_flows.view_flowstagebinding"
     paginate_by = 10
-    ordering = ["order", "flow"]
+    ordering = ["flow", "order"]
     template_name = "administration/stage_binding/list.html"