From a4359a4dc1fb65cce0422fb14ff8ab38db2726a4 Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Sun, 9 Apr 2023 13:31:43 +0300 Subject: [PATCH] Moved Tag to separate folder --- FOSSDB_web/apps/fossdb/admin.py | 3 ++- FOSSDB_web/apps/fossdb/models.py | 11 +---------- FOSSDB_web/apps/fossdb/tag/models.py | 11 +++++++++++ 3 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 FOSSDB_web/apps/fossdb/tag/models.py diff --git a/FOSSDB_web/apps/fossdb/admin.py b/FOSSDB_web/apps/fossdb/admin.py index 6a9f524..ea74c31 100644 --- a/FOSSDB_web/apps/fossdb/admin.py +++ b/FOSSDB_web/apps/fossdb/admin.py @@ -3,7 +3,8 @@ from django.contrib import admin from .host.models import HostingPlatform, ProjectHostingPlatform from .language.models import ProgrammingLanguage, ProjectProgrammingLanguage from .license.models import License -from .models import Project, Tag +from .models import Project +from .tag.models import Tag class ProjectProgrammingLanguageInline(admin.TabularInline): diff --git a/FOSSDB_web/apps/fossdb/models.py b/FOSSDB_web/apps/fossdb/models.py index 3ce4c4d..5fa0cf2 100644 --- a/FOSSDB_web/apps/fossdb/models.py +++ b/FOSSDB_web/apps/fossdb/models.py @@ -6,15 +6,6 @@ from django.db import models User = settings.AUTH_USER_MODEL -class Tag(models.Model): - name = models.CharField(max_length=100) - description = models.TextField(blank=True, default="") - icon = models.ImageField(upload_to="types/icons/", null=True, blank=True) - - def __str__(self): - return self.name - - class Project(models.Model): uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) author = models.ForeignKey(User, on_delete=models.CASCADE) @@ -23,7 +14,7 @@ class Project(models.Model): licenses = models.ManyToManyField("License") programming_languages = models.ManyToManyField("ProgrammingLanguage", through="ProjectProgrammingLanguage", related_name="projects") hosting_platform = models.ManyToManyField("HostingPlatform", through="ProjectHostingPlatform", related_name="projects") - tag = models.ManyToManyField(Tag) + tag = models.ManyToManyField("Tag") date_created = models.DateTimeField(auto_now_add=True) def save(self, *args, **kwargs): diff --git a/FOSSDB_web/apps/fossdb/tag/models.py b/FOSSDB_web/apps/fossdb/tag/models.py new file mode 100644 index 0000000..10bb71e --- /dev/null +++ b/FOSSDB_web/apps/fossdb/tag/models.py @@ -0,0 +1,11 @@ + +from django.db import models + + +class Tag(models.Model): + name = models.CharField(max_length=100) + description = models.TextField(blank=True, default="") + icon = models.ImageField(upload_to="types/icons/", null=True, blank=True) + + def __str__(self): + return self.name