Fix some organization bugs

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"

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;

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 %}
 

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 %}