From 3c99a2c4774ea89dc88c40eef2f2a778872c4b0a Mon Sep 17 00:00:00 2001
From: cuom1999 <lephuocdinh99@gmail.com>
Date: Mon, 24 Jun 2024 20:01:00 -0500
Subject: [PATCH] Fix some organization bugs

---
 judge/views/organization.py           | 2 +-
 resources/organization.scss           | 1 -
 templates/organization/list.html      | 3 ---
 templates/user/user-left-sidebar.html | 1 -
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/judge/views/organization.py b/judge/views/organization.py
index 0a3fc31..ddfce76 100644
--- a/judge/views/organization.py
+++ b/judge/views/organization.py
@@ -665,13 +665,13 @@ OrganizationRequestFormSet = modelformset_factory(
 
 
 class OrganizationRequestBaseView(
+    AdminOrganizationMixin,
     DetailView,
     OrganizationHomeView,
     TitleMixin,
     LoginRequiredMixin,
     SingleObjectTemplateResponseMixin,
     SingleObjectMixin,
-    AdminOrganizationMixin,
 ):
     model = Organization
     slug_field = "key"
diff --git a/resources/organization.scss b/resources/organization.scss
index 4eb83db..0b5ad24 100644
--- a/resources/organization.scss
+++ b/resources/organization.scss
@@ -52,7 +52,6 @@
     display: flex;
     flex-direction: column;
     justify-content: space-between;
-    height: 300px;
     margin-bottom: 1em;
     text-decoration: none;
     color: inherit;
diff --git a/templates/organization/list.html b/templates/organization/list.html
index 2efd915..a5bea81 100644
--- a/templates/organization/list.html
+++ b/templates/organization/list.html
@@ -39,9 +39,6 @@
     {% endif %}
     {{ make_tab_item('public', 'fa fa-globe', request.path + '?tab=public', _('Public')) }}
     {{ make_tab_item('private', 'fa fa-lock', request.path + '?tab=private', _('Private')) }}
-    {% if request.user.is_superuser %}
-      {{ make_tab_item('import', 'fa fa-table', url('import_users'), _('Import'), force_new_page=True) }}
-    {% endif %}
   </div>
 {% endblock %}
 
diff --git a/templates/user/user-left-sidebar.html b/templates/user/user-left-sidebar.html
index dfa6c18..ff4b2e1 100644
--- a/templates/user/user-left-sidebar.html
+++ b/templates/user/user-left-sidebar.html
@@ -1,7 +1,6 @@
 <div class="left-sidebar">
   {{ make_tab_item('list', 'fa fa-trophy', url('user_list'), _('Leaderboard')) }}
   {{ make_tab_item('friends', 'fa fa-users', url('user_list') + '?friend=true', _('Friends')) }}
-  {{ make_tab_item('organizations', 'fa fa-university', url('organization_list'), _('Groups')) }}
   {% if request.user.is_superuser %}
     {{ make_tab_item('import', 'fa fa-table', url('import_users'), _('Import'), force_new_page=True) }}
   {% endif %}