Merge branch 'license' into fossdb

FOSSDB_web/apps/fossdb/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from .models import (HostingPlatform, License, ProgrammingLanguage, Project,
+from .models import (HostingPlatform, ProgrammingLanguage, Project,
                      ProjectHostingPlatform, ProjectProgrammingLanguage, Tag)
 
 
@@ -25,7 +25,6 @@ class ProjectAdmin(admin.ModelAdmin):
         return " | ".join([i.hosting_platform.hosting_platform for i in object.projecthostingplatform_set.all()])
 
 
-admin.site.register(License)
 admin.site.register(ProgrammingLanguage)
 admin.site.register(HostingPlatform)
 admin.site.register(Project, ProjectAdmin)

FOSSDB_web/apps/fossdb/forms.py

@@ -1,6 +1,6 @@
 from django import forms
 
-from .models import (HostingPlatform, License, ProgrammingLanguage, Project,
+from .models import (HostingPlatform, ProgrammingLanguage, Project,
                      ProjectHostingPlatform, ProjectProgrammingLanguage)
 
 
@@ -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)
 

FOSSDB_web/apps/fossdb/migrations/0002_delete_license_alter_project_licenses.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.1.7 on 2023-04-08 10:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('license', '0001_initial'),
+        ('fossdb', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='License',
+        ),
+        migrations.AlterField(
+            model_name='project',
+            name='licenses',
+            field=models.ManyToManyField(to='license.license'),
+        ),
+    ]

FOSSDB_web/apps/fossdb/models.py

@@ -3,17 +3,7 @@ import uuid
 from django.conf import settings
 from django.db import models
 
-User = settings.AUTH_USER_MODEL
+from license.models import License
-
-
-class License(models.Model):
-    short_name = models.CharField(max_length=50)
-    full_name = models.CharField(max_length=100, blank=True)
-    url = models.URLField(null=True, blank=True)
-    description = models.TextField(null=True, blank=True)
-
-    def __str__(self):
-        return self.short_name
 
 
 class ProgrammingLanguage(models.Model):

FOSSDB_web/apps/license/admin.py

@@ -0,0 +1,5 @@
+from django.contrib import admin
+
+from .models import License
+
+admin.site.register(License)

FOSSDB_web/apps/license/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class LicenseConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'license'

FOSSDB_web/apps/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"]

FOSSDB_web/apps/license/migrations/0001_initial.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.1.7 on 2023-04-08 10:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='License',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('short_name', models.CharField(max_length=50)),
+                ('full_name', models.CharField(blank=True, max_length=100, null=True)),
+                ('url', models.URLField(blank=True, null=True)),
+                ('description', models.TextField(blank=True, null=True)),
+            ],
+        ),
+    ]

FOSSDB_web/apps/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, null=True, blank=True)
+    url = models.URLField(null=True, blank=True)
+    description = models.TextField(null=True, blank=True)
+
+    def __str__(self):
+        return self.short_name

FOSSDB_web/apps/license/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

FOSSDB_web/settings.py

@@ -37,6 +37,7 @@ ALLOWED_HOSTS = config["ALLOWED_HOSTS"]
 
 INSTALLED_APPS = [
     "fossdb",
+    "license",
     "account",
     "django.contrib.admin",
     "django.contrib.auth",