diff --git a/kaehmy/forms.py b/kaehmy/forms.py index c82b549..9784c12 100644 --- a/kaehmy/forms.py +++ b/kaehmy/forms.py @@ -2,7 +2,7 @@ from django import forms from django.utils.translation import ugettext_lazy as _ from django.core.exceptions import ValidationError -from kaehmy.models import PresetRole, CustomRole, Application, Comment, KaehmyBaseRole +from kaehmy.models import PresetRole, CustomRole, Application, Comment, BaseRole class CheckboxSelectMultiple(forms.widgets.CheckboxSelectMultiple): @@ -57,7 +57,7 @@ class ApplicationForm(forms.ModelForm): self.fields["custom_roles"].label = _("Custom roles") self.fields["custom_roles"].queryset = CustomRole.objects.all() - for cat_id, category in KaehmyBaseRole.CATEGORIES: + for cat_id, category in BaseRole.CATEGORIES: key = "preset_roles_{}".format(cat_id) qset = PresetRole.objects.filter(category=cat_id).order_by( "category", "-is_board" diff --git a/kaehmy/migrations/0011_delete_kaehmybaserole.py b/kaehmy/migrations/0011_delete_kaehmybaserole.py new file mode 100644 index 0000000..df1ab74 --- /dev/null +++ b/kaehmy/migrations/0011_delete_kaehmybaserole.py @@ -0,0 +1,16 @@ +# Generated by Django 3.2.14 on 2022-08-03 20:19 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('kaehmy', '0010_auto_20220726_2033'), + ] + + operations = [ + migrations.DeleteModel( + name='KaehmyBaseRole', + ), + ] diff --git a/kaehmy/models.py b/kaehmy/models.py index c20a865..54e533b 100644 --- a/kaehmy/models.py +++ b/kaehmy/models.py @@ -1,7 +1,6 @@ from django.db import models from django.utils import timezone from django.utils.translation import ugettext_lazy as _ -from webapp.models import BaseRole as OldBaseRole # TODO: Move BaseRole to Kaehmt App; will fuck up the DB since table is removed, if no data migration is done before-hand. @@ -44,29 +43,6 @@ class BaseRole(models.Model): return "{} ({})".format(n, _("board member")) if self.is_board else n -class KaehmyBaseRole(OldBaseRole): - """ABC""" - - CATEGORIES = ( - ("corporate", _("Corporate affairs")), - ("freshman", _("Freshmen")), - ("international", _("International")), - ("external", _("External affairs")), - ("media", _("Media")), - ("tech", _("Technology")), - ("wellbeing", _("Wellbeing")), - ("elepaja", _("Elepaja")), - ("ceremonies", _("Ceremonies")), - ("studies", _("Studies")), - ("sosso", _("Sössö magazine")), - ("alumni", _("Alumni relations")), - ("others", _("Others")), - ) - category = models.CharField( - _("Category"), choices=CATEGORIES, default="others", max_length=255 - ) - - class PresetRole(BaseRole): """Model for kaehmy role.""" diff --git a/webapp/migrations/0082_delete_baserole.py b/webapp/migrations/0082_delete_baserole.py new file mode 100644 index 0000000..794c137 --- /dev/null +++ b/webapp/migrations/0082_delete_baserole.py @@ -0,0 +1,17 @@ +# Generated by Django 3.2.14 on 2022-08-03 20:19 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('kaehmy', '0011_delete_kaehmybaserole'), + ('webapp', '0081_auto_20220801_2217'), + ] + + operations = [ + migrations.DeleteModel( + name='BaseRole', + ), + ] diff --git a/webapp/models.py b/webapp/models.py index 4a01b07..959171d 100644 --- a/webapp/models.py +++ b/webapp/models.py @@ -222,18 +222,6 @@ def email_on_signup(sender, instance, created, **kwargs): ) -class BaseRole(models.Model): - """Base model for occupations/roles.""" - - id = models.AutoField(primary_key=True) - name = models.CharField(_("Name"), max_length=255) - is_board = models.BooleanField(_("Board member")) - - def __str__(self): - n = self.name.capitalize() - return "{} ({})".format(n, _("board member")) if self.is_board else n - - class JobAd(models.Model): """Job advertisements shown on Corporate relations page"""