feat: remove Logo model (#991)

Author: gardenerik

bullet/bullet_admin/forms/content.py

@@ -5,7 +5,7 @@
 from django.utils.translation import get_language_info
 from django_countries import countries
 from django_countries.fields import Country
-from web.models import ContentBlock, Logo, Menu, Page, PageBlock
+from web.models import ContentBlock, Menu, Page, PageBlock
 
 
 class PageForm(forms.ModelForm):
@@ -156,33 +156,6 @@ def clean(self):
         return cleaned_data
 
 
-class LogoForm(forms.ModelForm):
-    class Meta:
-        model = Logo
-        fields = ("type", "name", "url", "image", "countries")
-
-        widgets = {
-            "countries": forms.CheckboxSelectMultiple(),
-        }
-
-    def __init__(self, branch: Branch, **kwargs):
-        super().__init__(**kwargs)
-        available_countries = set()
-
-        for country in BranchCountry.objects.filter(branch=branch).all():
-            available_countries.add(country.country.code)
-
-        self.fields["countries"].choices = list(
-            sorted(
-                filter(
-                    lambda x: x[0] in available_countries,
-                    self.fields["countries"].choices,
-                ),
-                key=lambda x: x[1],
-            )
-        )
-
-
 class MenuItemForm(forms.ModelForm):
     class Meta:
         model = Menu

bullet/bullet_admin/templates/bullet_admin/content/logo_form.html

@@ -69,7 +69,6 @@ def admin_sidebar(context):
                 (
                     ("fa-file-text", "Pages", reverse("badmin:page_list")),
                     ("fa-cube", "Blocks", reverse("badmin:contentblock_list")),
-                    ("fa-handshake", "Logos", reverse("badmin:logo_list")),
                     ("fa-bars", "Menu items", reverse("badmin:menu_list")),
                     ("fa-folder", "File browser", reverse("badmin:file_tree")),
                 ),

bullet/bullet_admin/templates/bullet_admin/content/logo_list.html

@@ -135,26 +135,6 @@
         content.ContentBlockDeleteView.as_view(),
         name="contentblock_delete",
     ),
-    path(
-        "content/logos/",
-        content.LogoListView.as_view(),
-        name="logo_list",
-    ),
-    path(
-        "content/logos/edit/<pk>/",
-        content.LogoEditView.as_view(),
-        name="logo_edit",
-    ),
-    path(
-        "content/logos/create/",
-        content.LogoCreateView.as_view(),
-        name="logo_create",
-    ),
-    path(
-        "content/logos/delete/<pk>/",
-        content.LogoDeleteView.as_view(),
-        name="logo_delete",
-    ),
     path(
         "content/menu/",
         content.MenuItemListView.as_view(),

bullet/bullet_admin/templatetags/badmin.py

@@ -6,13 +6,12 @@
 from django.urls import reverse, reverse_lazy
 from django.utils.functional import cached_property
 from django.views.generic import CreateView, DeleteView, FormView, ListView, UpdateView
-from web.models import ContentBlock, Logo, Menu, Page, PageBlock
+from web.models import ContentBlock, Menu, Page, PageBlock
 
 from bullet.views import FormAndFormsetMixin
 from bullet_admin.forms.content import (
     ContentBlockForm,
     ContentBlockWithRefForm,
-    LogoForm,
     MenuItemForm,
     PageBlockCreateForm,
     PageBlockUpdateForm,
@@ -371,57 +370,6 @@ def form_valid(self, form):
         )
 
 
-class LogoListView(TranslatorRequiredMixin, ListView):
-    template_name = "bullet_admin/content/logo_list.html"
-
-    def get_queryset(self):
-        return Logo.objects.filter(branch=self.request.BRANCH)
-
-
-class LogoEditView(TranslatorRequiredMixin, UpdateView):
-    template_name = "bullet_admin/content/logo_form.html"
-    form_class = LogoForm
-
-    def get_form_kwargs(self):
-        kw = super().get_form_kwargs()
-        kw["branch"] = self.request.BRANCH
-        return kw
-
-    def get_queryset(self):
-        return Logo.objects.filter(branch=self.request.BRANCH)
-
-    def get_success_url(self):
-        return reverse("badmin:logo_list")
-
-
-class LogoCreateView(TranslatorRequiredMixin, CreateView):
-    template_name = "bullet_admin/content/logo_form.html"
-    form_class = LogoForm
-
-    def get_form_kwargs(self):
-        kw = super().get_form_kwargs()
-        kw["branch"] = self.request.BRANCH
-        return kw
-
-    def get_success_url(self):
-        return reverse("badmin:logo_list")
-
-    def form_valid(self, form):
-        obj = form.save(commit=False)
-        obj.branch = self.request.BRANCH.id
-        obj.save()
-
-        return HttpResponseRedirect(reverse("badmin:logo_list"))
-
-
-class LogoDeleteView(TranslatorRequiredMixin, BDeleteView):
-    def get_queryset(self):
-        return Logo.objects.filter(branch=self.request.BRANCH)
-
-    def get_success_url(self):
-        return reverse("badmin:logo_list")
-
-
 class MenuItemListView(TranslatorRequiredMixin, GenericList, ListView):
     create_url = reverse_lazy("badmin:menu_create")
     fields = ["title", "url", "order", "language", "countries"]

bullet/bullet_admin/urls/__init__.py

@@ -10,7 +10,7 @@
 from education.factories.generate import create_education
 from problems.factories.generate import create_problems
 from users.factories.generate import create_users
-from web.factories.generate import create_pages, create_partners
+from web.factories.generate import create_pages
 
 from bullet import search
 
@@ -35,6 +35,5 @@ def handle(self, *args, **options):
         )
         create_problems(competition_physics)
 
-        create_partners()
         create_users(competition_physics)
         management.call_command("indexschools")

bullet/bullet_admin/views/content.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from web.models import ContentBlock, Logo, Menu, Page, PageBlock
+from web.models import ContentBlock, Menu, Page, PageBlock
 
 admin.site.site_title = "Bullet system administration"
 admin.site.site_header = "Bullet system administration"
@@ -12,12 +12,6 @@ class PageAdmin(admin.ModelAdmin):
     list_filter = ["branch", "language", "slug"]
 
 
-@admin.register(Logo)
-class LogoAdmin(admin.ModelAdmin):
-    list_display = ["branch", "type", "name", "countries"]
-    list_filter = ["branch", "type"]
-
-
 @admin.register(Menu)
 class MenuAdmin(admin.ModelAdmin):
     list_display = ["title", "branch", "language", "countries", "url", "order"]

bullet/competitions/management/commands/generatedata.py

@@ -3,7 +3,6 @@
 from django.db.models import QuerySet
 from web.factories.menu import MenuFactory
 from web.factories.pages import PageFactory
-from web.factories.partners import LogoFactory
 
 
 def create_pages(branch: Branch):
@@ -39,7 +38,3 @@ def create_pages(branch: Branch):
             countries=countries,
             external=True,
         )
-
-
-def create_partners():
-    LogoFactory.create_batch(50)