Tags + SVG Logos + Index Fixes + Browse Fixes (#106)

Author: apavlo

.env

@@ -87,6 +87,7 @@ class ProgrammingLanguageAdmin(admin.ModelAdmin):
 admin.site.register(License, LicenseAdmin)
 admin.site.register(OperatingSystem, OperatingSystemAdmin)
 admin.site.register(ProgrammingLanguage, ProgrammingLanguageAdmin)
+admin.site.register(Tag)
 admin.site.register(ProjectType)
 admin.site.register(Publication)
 #admin.site.register(SuggestedSystem)

dbdb/core/admin.py

@@ -248,6 +248,7 @@ class Meta:
             'end_year_citations',
             'acquired_by',
             'acquired_by_citations',
+            'tags',
             'project_types',
             'countries',
             'former_names',
@@ -299,6 +300,7 @@ class Meta:
             'end_year_citations',
             'acquired_by',
             'acquired_by_citations',
+            'tags',
             'project_types',
             'countries',
             'former_names',

dbdb/core/forms.py

@@ -0,0 +1,35 @@
+# Generated by Django 3.1.14 on 2022-06-26 17:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0024_systemversion_twitter_handle'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Tag',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('slug', models.SlugField(unique=True)),
+                ('name', models.CharField(max_length=64)),
+                ('url', models.URLField(blank=True, max_length=512)),
+            ],
+            options={
+                'ordering': ('name',),
+            },
+        ),
+        migrations.AddField(
+            model_name='projecttype',
+            name='description',
+            field=models.TextField(blank=True, help_text='This field supports Markdown Syntax'),
+        ),
+        migrations.AddField(
+            model_name='systemversion',
+            name='tags',
+            field=models.ManyToManyField(blank=True, related_name='tags', to='core.Tag', verbose_name='Tag'),
+        ),
+    ]

dbdb/core/migrations/0025_auto_20220626_1344.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.1.14 on 2022-06-26 19:11
+
+from django.db import migrations
+import easy_thumbnails.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0025_auto_20220626_1344'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='systemversion',
+            name='logo',
+            field=easy_thumbnails.fields.ThumbnailerField(blank=True, upload_to='logos/'),
+        ),
+    ]

dbdb/core/migrations/0026_auto_20220626_1511.py

@@ -12,7 +12,7 @@
 from django.urls import reverse
 from django.utils import timezone
 # third-party imports
-from easy_thumbnails.fields import ThumbnailerImageField
+from easy_thumbnails.fields import ThumbnailerImageField,ThumbnailerField
 from django_countries.fields import CountryField
 
 
@@ -51,7 +51,6 @@ def __str__(self):
 class FeatureOption(models.Model):
 
     feature = models.ForeignKey('Feature', models.CASCADE, related_name='options')
-
     slug = models.SlugField(db_index=True, unique=False)
     value = models.CharField(max_length=100)
 
@@ -63,6 +62,41 @@ def __str__(self):
 
     pass
 
+# ==============================================
+# M2MInfoModel
+# ==============================================
+#class M2MInfoModel(models.Model):
+    #slug = models.SlugField(unique=True)
+    #name = models.CharField(max_length=64)
+    #url = models.URLField(blank=True, max_length=512)
+    #description = models.TextField(blank=True, help_text='This field supports Markdown Syntax')
+
+    #class Meta:
+        #ordering = ('name',)
+        #abstract = True
+
+    #def __str__(self):
+        #return self.name
+
+    #pass
+
+# ==============================================
+# Tag
+# ==============================================
+class Tag(models.Model):
+    slug = models.SlugField(unique=True)
+    name = models.CharField(max_length=64)
+    url = models.URLField(blank=True, max_length=512)
+
+    class Meta:
+        ordering = ('name',)
+
+
+    def __str__(self):
+        return self.name
+
+    pass
+
 # ==============================================
 # License
 # ==============================================
@@ -123,6 +157,7 @@ class ProjectType(models.Model):
 
     slug = models.SlugField(unique=True)
     name = models.CharField(max_length=32)
+    description = models.TextField(blank=True, help_text='This field supports Markdown Syntax')
 
     class Meta:
         ordering = ('name',)
@@ -351,6 +386,11 @@ class SystemVersion(models.Model):
         related_name='version_acquired_bys')
 
     # General Information Fields
+    tags = models.ManyToManyField(
+        'Tag', blank=True,
+        related_name='tags',
+        verbose_name='Tag')
+
     project_types = models.ManyToManyField(
         'ProjectType', blank=True,
         related_name='project_types',
@@ -360,7 +400,7 @@ class SystemVersion(models.Model):
         blank=True, max_length=500,
         help_text="The original organization that developed the DBMS.")
 
-    logo = ThumbnailerImageField(
+    logo = ThumbnailerField(
         blank=True, upload_to='logos/')
 
     countries = CountryField(
@@ -413,6 +453,9 @@ def __str__(self):
     def get_absolute_url(self):
         return reverse('system_revision_view', args=[self.system.slug, self.ver])
 
+    def tags_str(self):
+        return ', '.join( self.tags.values_list('name', flat=True) )
+
     def project_types_str(self):
         return ', '.join( self.project_types.values_list('name', flat=True) )
 
@@ -600,6 +643,7 @@ def written_in_str(self):
     'License',
     'OperatingSystem',
     'ProgrammingLanguage',
+    'Tag',
     'ProjectType',
     'Publication',
     'SuggestedSystem',

dbdb/core/models.py

@@ -12,11 +12,8 @@ class SystemVersionIndex(indexes.SearchIndex, indexes.Indexable):
 
     text = indexes.NgramField(document=True, use_template=True)
 
-    created = indexes.DateTimeField(model_attr='created')
     letter = indexes.CharField()
-    logo = indexes.CharField(model_attr='logo')
     name = indexes.CharField(model_attr='system__name')
-    slug = indexes.CharField(model_attr='system__slug')
     start_year = indexes.IntegerField(model_attr='start_year', null=True)
     end_year = indexes.IntegerField(model_attr='end_year', null=True)
 
@@ -31,12 +28,18 @@ class SystemVersionIndex(indexes.SearchIndex, indexes.Indexable):
     oses = indexes.MultiValueField()
     written_langs = indexes.MultiValueField()
     supported_langs = indexes.MultiValueField()
+    tags = indexes.MultiValueField()
     project_types = indexes.MultiValueField()
     licenses = indexes.MultiValueField()
 
     features = indexes.MultiValueField()
     feature_options = indexes.MultiValueField()
 
+    # INCLUDE fields
+    slug = indexes.CharField(model_attr='system__slug', indexed=False)
+    created = indexes.DateTimeField(model_attr='created', indexed=False)
+    logo = indexes.CharField(model_attr='logo', indexed=False)
+
     def get_model(self):
         return SystemVersion
 
@@ -126,11 +129,16 @@ def prepare_supported_langs(self, obj):
 
         return values
 
+    def prepare_tags(self, obj):
+        values = list(
+            obj.tags.values_list('slug', flat=True)
+        )
+        return values
+
     def prepare_project_types(self, obj):
         values = list(
             obj.project_types.values_list('slug', flat=True)
         )
-
         return values
 
     def prepare_licenses(self, obj):
@@ -164,7 +172,10 @@ def prepare_feature_options(self, obj):
         return values
 
     def prepare_letter(self, obj):
-        return obj.system.name[0].lower()
+        letter = obj.system.name[0].lower()
+        if not letter.isalpha():
+            letter = '#'
+        return letter
 
     def prepare_lowercase_name(self, obj):
         return obj.system.name.lower().strip()