From fdf883352371543ed3f21e920d9f6fe606756653 Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Sun, 9 Apr 2023 13:20:45 +0300 Subject: [PATCH] Moved License model to separate folder --- FOSSDB_web/apps/fossdb/admin.py | 3 ++- FOSSDB_web/apps/fossdb/forms.py | 6 ------ FOSSDB_web/apps/fossdb/license/forms.py | 9 +++++++++ FOSSDB_web/apps/fossdb/license/models.py | 11 +++++++++++ FOSSDB_web/apps/fossdb/migrations/0001_initial.py | 6 +++--- FOSSDB_web/apps/fossdb/models.py | 12 ++---------- 6 files changed, 27 insertions(+), 20 deletions(-) create mode 100644 FOSSDB_web/apps/fossdb/license/forms.py create mode 100644 FOSSDB_web/apps/fossdb/license/models.py diff --git a/FOSSDB_web/apps/fossdb/admin.py b/FOSSDB_web/apps/fossdb/admin.py index 21327ac..893dce9 100644 --- a/FOSSDB_web/apps/fossdb/admin.py +++ b/FOSSDB_web/apps/fossdb/admin.py @@ -1,6 +1,7 @@ from django.contrib import admin -from .models import (HostingPlatform, License, ProgrammingLanguage, Project, +from .license.models import License +from .models import (HostingPlatform, ProgrammingLanguage, Project, ProjectHostingPlatform, ProjectProgrammingLanguage, Tag) diff --git a/FOSSDB_web/apps/fossdb/forms.py b/FOSSDB_web/apps/fossdb/forms.py index 9da02f4..1eafc30 100644 --- a/FOSSDB_web/apps/fossdb/forms.py +++ b/FOSSDB_web/apps/fossdb/forms.py @@ -23,12 +23,6 @@ class ProjectForm(forms.ModelForm): } -class LicenseForm(forms.ModelForm): - class Meta: - model = License - fields = ["short_name", "full_name", "url", "description"] - - class ProgrammingLanguageForm(forms.ModelForm): percentage = forms.IntegerField(min_value=0, max_value=100) diff --git a/FOSSDB_web/apps/fossdb/license/forms.py b/FOSSDB_web/apps/fossdb/license/forms.py new file mode 100644 index 0000000..0c180da --- /dev/null +++ b/FOSSDB_web/apps/fossdb/license/forms.py @@ -0,0 +1,9 @@ +from django import forms + +from .models import License + + +class LicenseForm(forms.ModelForm): + class Meta: + model = License + fields = ["short_name", "full_name", "url", "description"] diff --git a/FOSSDB_web/apps/fossdb/license/models.py b/FOSSDB_web/apps/fossdb/license/models.py new file mode 100644 index 0000000..572a0b4 --- /dev/null +++ b/FOSSDB_web/apps/fossdb/license/models.py @@ -0,0 +1,11 @@ +from django.db import models + + +class License(models.Model): + short_name = models.CharField(max_length=50) + full_name = models.CharField(max_length=100, blank=True, default="") + url = models.URLField(blank=True, default="") + description = models.TextField(blank=True, default="") + + def __str__(self): + return self.short_name diff --git a/FOSSDB_web/apps/fossdb/migrations/0001_initial.py b/FOSSDB_web/apps/fossdb/migrations/0001_initial.py index 33d8a96..a142884 100644 --- a/FOSSDB_web/apps/fossdb/migrations/0001_initial.py +++ b/FOSSDB_web/apps/fossdb/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.1.7 on 2023-04-08 12:47 +# Generated by Django 4.1.7 on 2023-04-09 10:17 from django.conf import settings from django.db import migrations, models @@ -93,7 +93,7 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name='project', - name='project_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='fossdb.tag'), + name='tag', + field=models.ManyToManyField(to='fossdb.tag'), ), ] diff --git a/FOSSDB_web/apps/fossdb/models.py b/FOSSDB_web/apps/fossdb/models.py index 0d88e65..3061570 100644 --- a/FOSSDB_web/apps/fossdb/models.py +++ b/FOSSDB_web/apps/fossdb/models.py @@ -3,19 +3,11 @@ import uuid from django.conf import settings from django.db import models +from .license.models import License + User = settings.AUTH_USER_MODEL -class License(models.Model): - short_name = models.CharField(max_length=50) - full_name = models.CharField(max_length=100, blank=True, default="") - url = models.URLField(blank=True, default="") - description = models.TextField(blank=True, default="") - - def __str__(self): - return self.short_name - - class HostingPlatform(models.Model): hosting_platform = models.CharField(max_length=100)