From 0c388c78cfc7c980ec02e198d38f1904ad784b38 Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Sun, 25 Jun 2023 13:47:18 +0000 Subject: [PATCH] Rename `ProgrammingLanguage` directory --- FOSSDB/apps/fossdb/language/forms.py | 22 ----------------- .../apps/fossdb/programming_language/forms.py | 24 +++++++++++++++++++ .../models.py | 4 ++-- 3 files changed, 26 insertions(+), 24 deletions(-) delete mode 100644 FOSSDB/apps/fossdb/language/forms.py create mode 100644 FOSSDB/apps/fossdb/programming_language/forms.py rename FOSSDB/apps/fossdb/{language => programming_language}/models.py (84%) diff --git a/FOSSDB/apps/fossdb/language/forms.py b/FOSSDB/apps/fossdb/language/forms.py deleted file mode 100644 index a7cadf3..0000000 --- a/FOSSDB/apps/fossdb/language/forms.py +++ /dev/null @@ -1,22 +0,0 @@ -from django import forms - -from fossdb.models import Project - -from .models import ProgrammingLanguage, ProjectProgrammingLanguage - - -class ProgrammingLanguageForm(forms.ModelForm): - percentage = forms.IntegerField(min_value=0, max_value=100) - - class Meta: - model = ProgrammingLanguage - fields = ["language", "percentage"] - - -ProjectProgrammingLanguageFormSet = forms.inlineformset_factory( - Project, - ProjectProgrammingLanguage, - form=ProgrammingLanguageForm, - extra=1, - can_delete=True, -) diff --git a/FOSSDB/apps/fossdb/programming_language/forms.py b/FOSSDB/apps/fossdb/programming_language/forms.py new file mode 100644 index 0000000..eee0c01 --- /dev/null +++ b/FOSSDB/apps/fossdb/programming_language/forms.py @@ -0,0 +1,24 @@ +from django import forms +from django.forms import inlineformset_factory +from fossdb.models import Project + +from .models import ProgrammingLanguage, ProjectProgrammingLanguage + + +class ProgrammingLanguageForm(forms.ModelForm): + programming_language = forms.ModelChoiceField( + queryset=ProgrammingLanguage.objects.all() + ) + + class Meta: + model = ProjectProgrammingLanguage + fields = ("programming_language", "percentage") + + +ProjectProgrammingLanguageFormSet = inlineformset_factory( + Project, + ProjectProgrammingLanguage, + form=ProgrammingLanguageForm, + extra=1, + can_delete=True, +) diff --git a/FOSSDB/apps/fossdb/language/models.py b/FOSSDB/apps/fossdb/programming_language/models.py similarity index 84% rename from FOSSDB/apps/fossdb/language/models.py rename to FOSSDB/apps/fossdb/programming_language/models.py index 9a624f1..ef787db 100644 --- a/FOSSDB/apps/fossdb/language/models.py +++ b/FOSSDB/apps/fossdb/programming_language/models.py @@ -2,10 +2,10 @@ from django.db import models class ProgrammingLanguage(models.Model): - language = models.CharField(max_length=100) + name = models.CharField(max_length=100, unique=True) def __str__(self): - return self.language + return self.name class ProjectProgrammingLanguage(models.Model):