Fix missed URLs

VNOI-Admin · Sep 28, 2023 · ffb4b75 · ffb4b75
1 parent 970c451
commit ffb4b75
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
diff --git a/judge/sitemap.py b/judge/sitemap.py
@@ -45,7 +45,7 @@ class OrganizationSitemap(Sitemap):
     priority = 0.5
 
     def items(self):
-        return Organization.objects.values_list('id', 'slug')
+        return Organization.objects.values_list('slug')
 
     def location(self, obj):
         return reverse('organization_home', args=obj)

diff --git a/judge/views/organization.py b/judge/views/organization.py
@@ -174,8 +174,6 @@ class OrganizationRequestForm(Form):
 
 class RequestJoinOrganization(LoginRequiredMixin, SingleObjectMixin, FormView):
     model = Organization
-    slug_field = 'key'
-    slug_url_kwarg = 'key'
     template_name = 'organization/requests/request.html'
     form_class = OrganizationRequestForm
 
@@ -224,8 +222,6 @@ def get_object(self, queryset=None):
 
 class OrganizationRequestBaseView(LoginRequiredMixin, SingleObjectTemplateResponseMixin, SingleObjectMixin, View):
     model = Organization
-    slug_field = 'key'
-    slug_url_kwarg = 'key'
     tab = None
 
     def get_object(self, queryset=None):

diff --git a/templates/organization/requests/log.html b/templates/organization/requests/log.html
@@ -15,7 +15,7 @@
                 <tr id="request-{{ r.id }}">
                     <td>{{ link_user(r.user) }}</td>
                     <td>
-                        <a href="{{ url('request_organization_detail', object.id, object.slug, r.id) }}">
+                        <a href="{{ url('request_organization_detail', object.slug, r.id) }}">
                             {{- r.time|date(_("N j, Y, H:i")) -}}
                         </a>
                     </td>

diff --git a/templates/organization/requests/pending.html b/templates/organization/requests/pending.html
@@ -20,7 +20,7 @@
                 {% for form in formset %}
                     <tr id="request-{{ form.instance.id }}">
                         <td>{{ form.id }}{{ link_user(form.instance.user) }}</td>
-                        <td><a href="{{ url('request_organization_detail', object.id, object.slug, form.instance.id) }}">
+                        <td><a href="{{ url('request_organization_detail', object.slug, form.instance.id) }}">
                             {{ form.instance.time|date(_("N j, Y, H:i")) }}
                         </a></td>
                         <td>{{ form.state }}</td>
@@ -36,4 +36,4 @@
     {% else %}
         <p>{{ _('There are no requests to approve.') }}</p>
     {% endif %}
-{% endblock %}
+{% endblock %}
diff --git a/templates/organization/requests/tabs.html b/templates/organization/requests/tabs.html
@@ -1,16 +1,16 @@
 <div class="tabs">
     <ul>
         <li{% if tab == 'pending' %} class="active"{% endif %}>
-            <a href="{{ url('organization_requests_pending', object.id, object.slug) }}">{{ _('Pending') }}</a>
+            <a href="{{ url('organization_requests_pending', object.slug) }}">{{ _('Pending') }}</a>
         </li>
         <li{% if tab == 'log' %} class="active"{% endif %}>
-            <a href="{{ url('organization_requests_log', object.id, object.slug) }}">{{ _('Log') }}</a>
+            <a href="{{ url('organization_requests_log', object.slug) }}">{{ _('Log') }}</a>
         </li>
         <li{% if tab == 'approved' %} class="active"{% endif %}>
-            <a href="{{ url('organization_requests_approved', object.id, object.slug) }}">{{ _('Approved') }}</a>
+            <a href="{{ url('organization_requests_approved', object.slug) }}">{{ _('Approved') }}</a>
         </li>
         <li{% if tab == 'rejected' %} class="active"{% endif %}>
-            <a href="{{ url('organization_requests_rejected', object.id, object.slug) }}">{{ _('Rejected') }}</a>
+            <a href="{{ url('organization_requests_rejected', object.slug) }}">{{ _('Rejected') }}</a>
         </li>
     </ul>
-</div>
+</div>