allow for slashes in org ids

ThreeSixtyGiving · Jan 9, 2025 · 194d73f · 194d73f
1 parent fa33d94
commit 194d73f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/jinja2/grantmakers/partials/fundertable.html.j2 b/jinja2/grantmakers/partials/fundertable.html.j2
@@ -44,8 +44,11 @@
 {% call wrap_table() %}
 {% for object in object_list %}
 <tr class="{% if object.current_year.checked == 'Checked' %}positive{% endif %}">
-    <td><a class="b" href="{{ url_for('grantmakers:detail', org_id=object.org_id) }}">{{ object.name }}</a>
-    <td><a href="{{ url_for('grantmakers:detail', org_id=object.org_id) }}">{{ object.org_id }}</a></td>
+    <td>
+        <a class="b" href="{{ url_for('grantmakers:detail', org_id=object.org_id) }}">{{ object.name }}</a>
+    </td>
+    <td>
+        <a href="{{ url_for('grantmakers:detail', org_id=object.org_id) }}">{{ object.org_id }}</a>
     </td>
     <td>{{ display_text(object.segment) }}</td>
     <td class="tc">{{ display_boolean(object.included) }}</td>

diff --git a/ukgrantmaking/urls/grantmakers.py b/ukgrantmaking/urls/grantmakers.py
@@ -42,38 +42,38 @@
         kwargs={"filetype": "csv"},
     ),
     path(
-        "funder/<str:org_id>/",
-        detail,
-        name="detail",
+        "funder/<path:org_id>/funderyear/<int:funderyear_id>",
+        htmx_edit_funderyear,
+        name="edit_funderyear",
+    ),
+    path(
+        "funder/<path:org_id>/note/<int:note_id>",
+        htmx_edit_note,
+        name="edit_note",
     ),
     path(
-        "funder/<str:org_id>/change_status",
+        "funder/<path:org_id>/change_status",
         htmx_edit_funder,
         name="change_status",
     ),
     path(
-        "funder/<str:org_id>/tags",
+        "funder/<path:org_id>/tags",
         htmx_tags_edit,
         name="edit_tags",
     ),
     path(
-        "funder/<str:org_id>/note",
+        "funder/<path:org_id>/note",
         htmx_edit_note,
         name="add_note",
     ),
     path(
-        "funder/<str:org_id>/note/<int:note_id>",
-        htmx_edit_note,
-        name="edit_note",
-    ),
-    path(
-        "funder/<str:org_id>/funderyear",
+        "funder/<path:org_id>/funderyear",
         htmx_edit_funderyear,
         name="add_funderyear",
     ),
     path(
-        "funder/<str:org_id>/funderyear/<int:funderyear_id>",
-        htmx_edit_funderyear,
-        name="edit_funderyear",
+        "funder/<path:org_id>/",
+        detail,
+        name="detail",
     ),
 ]