From f7fdfdee37cc23132b2ee4505d6cf00e3b283b73 Mon Sep 17 00:00:00 2001
From: MizukiTemma <temma@integreat-app.de>
Date: Mon, 23 Sep 2024 15:33:44 +0200
Subject: [PATCH] Apply suggestions

---
 .../templates/linkcheck/link_list_row.html    |  4 ++--
 .../templates/linkcheck/links_by_filter.html  | 20 +++++++++----------
 .../cms/templatetags/linkcheck_filters.py     |  2 +-
 .../views/linkcheck/linkcheck_list_view.py    |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/integreat_cms/cms/templates/linkcheck/link_list_row.html b/integreat_cms/cms/templates/linkcheck/link_list_row.html
index a1ab2d6134..ec21c22ffe 100644
--- a/integreat_cms/cms/templates/linkcheck/link_list_row.html
+++ b/integreat_cms/cms/templates/linkcheck/link_list_row.html
@@ -103,7 +103,7 @@
         </td>
         <td class="text-right pr-4">
             <a title="{% if request.region %}{% translate "Replace URL centrally in the current region" %}{% else %}{% translate "Replace URL globally in all the regions" %}{% endif %}"
-               href="{% linkcheck_url 'edit_url' request url_id=url.id url_filter=view.kwargs.url_filter %}{{ pagination_params }}#replace-url"
+               href="{% url_for_current_region 'edit_url' request url_id=url.id url_filter=view.kwargs.url_filter %}{{ pagination_params }}#replace-url"
                class="btn-icon">
                 <i icon-name="pen-square"></i>
             </a>
@@ -114,7 +114,7 @@
             <td colspan="10">
                 <div class="flex gap-2 p-2">
                     {% render_field edit_url_form.url|add_error_class:"border-red-500" type="url" form="edit-url-form" %}
-                    <a href="{% linkcheck_url 'linkcheck' request url_filter=view.kwargs.url_filter %}{{ pagination_params }}"
+                    <a href="{% url_for_current_region 'linkcheck' request url_filter=view.kwargs.url_filter %}{{ pagination_params }}"
                        class="btn btn-red">{% translate "Cancel" %}</a>
                     <button type="submit" form="edit-url-form" class="btn">
                         {% translate "Save" %}
diff --git a/integreat_cms/cms/templates/linkcheck/links_by_filter.html b/integreat_cms/cms/templates/linkcheck/links_by_filter.html
index c2f665f55e..822b0c23d4 100644
--- a/integreat_cms/cms/templates/linkcheck/links_by_filter.html
+++ b/integreat_cms/cms/templates/linkcheck/links_by_filter.html
@@ -22,34 +22,34 @@ <h1 class="heading">
             {% endif %}
         </h1>
         {% if request.user.expert_mode %}
-            <a href="{% linkcheck_url 'search_and_replace_link' request %}"
+            <a href="{% url_for_current_region 'search_and_replace_link' request %}"
                class="font-bold text-sm text-gray-800 flex items-center gap-1 mb-2 hover:underline">
                 <span><i icon-name="replace" class="align-top h-5"></i> {% translate "Search & replace" %}</span>
             </a>
         {% endif %}
     </div>
-    <a href="{% if view.kwargs.url_filter == 'valid' %}#{% else %}{% linkcheck_url 'linkcheck' request url_filter='valid' %}{{ pagination_params }}{% endif %}"
+    <a href="{% if view.kwargs.url_filter == 'valid' %} # {% else %}{% url_for_current_region 'linkcheck' request url_filter='valid' %}{{ pagination_params }}{% endif %}"
        class="pr-2 {% if view.kwargs.url_filter == 'valid' %}text-black font-bold cursor-default{% else %}bg-transparent hover:underline text-blue-500 hover:text-blue-600 cursor-pointer{% endif %}">
         {% translate "Valid" %}
         <span class="{% if view.kwargs.url_filter == 'valid' %}text-gray-500 font-normal{% endif %}">
             ({{ number_valid_urls }})
         </span>
     </a>
-    <a href="{% if view.kwargs.url_filter == 'invalid' %} # {% else %} {% linkcheck_url 'linkcheck' request url_filter='invalid' %}{{ pagination_params }} {% endif %}"
+    <a href="{% if view.kwargs.url_filter == 'invalid' %} # {% else %} {% url_for_current_region 'linkcheck' request url_filter='invalid' %}{{ pagination_params }} {% endif %}"
        class="px-2 border-l-2 border-gray-500 {% if view.kwargs.url_filter == 'invalid' %}text-black font-bold cursor-default{% else %}bg-transparent hover:underline text-blue-500 hover:text-blue-600 cursor-pointer{% endif %}">
         {% translate "Invalid" %}
         <span class="{% if view.kwargs.url_filter == 'invalid' %}text-gray-500 font-normal{% endif %}">
             ({{ number_invalid_urls }})
         </span>
     </a>
-    <a href="{% if view.kwargs.url_filter == 'unchecked' %} # {% else %} {% linkcheck_url 'linkcheck' request url_filter='unchecked' %}{{ pagination_params }} {% endif %}"
+    <a href="{% if view.kwargs.url_filter == 'unchecked' %} # {% else %} {% url_for_current_region 'linkcheck' request url_filter='unchecked' %}{{ pagination_params }} {% endif %}"
        class="px-2 border-l-2 border-gray-500 {% if view.kwargs.url_filter == 'unchecked' %}text-black font-bold cursor-default{% else %}bg-transparent hover:underline text-blue-500 hover:text-blue-600 cursor-pointer{% endif %}">
         {% translate "Unchecked" %}
         <span class="{% if view.kwargs.url_filter == 'unchecked' %}text-gray-500 font-normal{% endif %}">
             ({{ number_unchecked_urls }})
         </span>
     </a>
-    <a href="{% if view.kwargs.url_filter == 'ignored' %} # {% else %} {% linkcheck_url 'linkcheck' request url_filter='ignored' %}{{ pagination_params }} {% endif %}"
+    <a href="{% if view.kwargs.url_filter == 'ignored' %} # {% else %} {% url_for_current_region 'linkcheck' request url_filter='ignored' %}{{ pagination_params }} {% endif %}"
        class="px-2 border-l-2 border-gray-500 {% if view.kwargs.url_filter == 'ignored' %}text-black font-bold cursor-default{% else %}bg-transparent hover:underline text-blue-500 hover:text-blue-600 cursor-pointer{% endif %}">
         {% translate "Ignored" %}
         <span class="{% if view.kwargs.url_filter == 'ignored' %}text-gray-500 font-normal{% endif %}">
@@ -58,7 +58,7 @@ <h1 class="heading">
     </a>
     {% if request.user.expert_mode %}
         {% if LINKCHECK_EMAIL_ENABLED %}
-            <a href="{% if view.kwargs.url_filter == 'email' %} # {% else %} {% linkcheck_url 'linkcheck' request url_filter='email' %}{{ pagination_params }} {% endif %}"
+            <a href="{% if view.kwargs.url_filter == 'email' %} # {% else %} {% url_for_current_region 'linkcheck' request url_filter='email' %}{{ pagination_params }} {% endif %}"
                class="px-2 border-l-2 border-gray-500 {% if view.kwargs.url_filter == 'email' %}text-black font-bold cursor-default{% else %}bg-transparent hover:underline text-blue-500 hover:text-blue-600 cursor-pointer{% endif %}">
                 {% translate "Email links" %}
                 <span class="{% if view.kwargs.url_filter == 'email' %}text-gray-500 font-normal{% endif %}">
@@ -67,7 +67,7 @@ <h1 class="heading">
             </a>
         {% endif %}
         {% if LINKCHECK_PHONE_ENABLED %}
-            <a href="{% if view.kwargs.url_filter == 'phone' %} # {% else %} {% linkcheck_url 'linkcheck' request url_filter='phone' %}{{ pagination_params }} {% endif %}"
+            <a href="{% if view.kwargs.url_filter == 'phone' %} # {% else %} {% url_for_current_region 'linkcheck' request url_filter='phone' %}{{ pagination_params }} {% endif %}"
                class="px-2 border-l-2 border-gray-500 {% if view.kwargs.url_filter == 'phone' %}text-black font-bold cursor-default{% else %}bg-transparent hover:underline text-blue-500 hover:text-blue-600 cursor-pointer{% endif %}">
                 {% translate "Phone links" %}
                 <span class="{% if view.kwargs.url_filter == 'phone' %}text-gray-500 font-normal{% endif %}">
@@ -171,16 +171,16 @@ <h1 class="heading">
                 </option>
                 {% if view.kwargs.url_filter == 'ignored' %}
                     <option value="unignore"
-                            data-bulk-action="{% linkcheck_url 'linkcheck' request url_filter=view.kwargs.url_filter %} {{ pagination_params }}">
+                            data-bulk-action="{% url_for_current_region 'linkcheck' request url_filter=view.kwargs.url_filter %} {{ pagination_params }}">
                         {% translate "Unignore" %}
                     </option>
                 {% else %}
                     <option value="recheck"
-                            data-bulk-action="{% linkcheck_url 'linkcheck' request url_filter=view.kwargs.url_filter %} {{ pagination_params }}">
+                            data-bulk-action="{% url_for_current_region 'linkcheck' request url_filter=view.kwargs.url_filter %} {{ pagination_params }}">
                         {% translate "Recheck" %}
                     </option>
                     <option value="ignore"
-                            data-bulk-action="{% linkcheck_url 'linkcheck' request url_filter=view.kwargs.url_filter %} {{ pagination_params }}">
+                            data-bulk-action="{% url_for_current_region 'linkcheck' request url_filter=view.kwargs.url_filter %} {{ pagination_params }}">
                         {% translate "Ignore" %}
                     </option>
                 {% endif %}
diff --git a/integreat_cms/cms/templatetags/linkcheck_filters.py b/integreat_cms/cms/templatetags/linkcheck_filters.py
index 312a76c009..5d4c75c6f5 100644
--- a/integreat_cms/cms/templatetags/linkcheck_filters.py
+++ b/integreat_cms/cms/templatetags/linkcheck_filters.py
@@ -57,7 +57,7 @@ def url_anchor_icon(url: Url) -> str:
 
 @register.simple_tag
 @mark_safe
-def linkcheck_url(target: str, request: HttpRequest, **kwargs: Any) -> str:
+def url_for_current_region(target: str, request: HttpRequest, **kwargs: Any) -> str:
     """
     Return the url matching the target url name, region and other supplied slugs
 
diff --git a/integreat_cms/cms/views/linkcheck/linkcheck_list_view.py b/integreat_cms/cms/views/linkcheck/linkcheck_list_view.py
index dcce22c8f9..f449b12b17 100644
--- a/integreat_cms/cms/views/linkcheck/linkcheck_list_view.py
+++ b/integreat_cms/cms/views/linkcheck/linkcheck_list_view.py
@@ -220,6 +220,6 @@ def post(self, request: HttpRequest, *args: Any, **kwargs: Any) -> HttpResponse:
 
         invalidate_model(Link)
         invalidate_model(Url)
-        linkcheck_url = reverse("linkcheck", kwargs=kwargs)
+        url_for_current_region = reverse("linkcheck", kwargs=kwargs)
         # Keep pagination settings
-        return redirect(f"{linkcheck_url}{self.get_pagination_params()}")
+        return redirect(f"{url_for_current_region}{self.get_pagination_params()}")