Added Twitter handle field for each system

Author: apavlo

dbdb/core/admin.py

@@ -44,7 +44,9 @@ class SystemVersionAdmin(admin.ModelAdmin):
     empty_value_display = 'unknown'
     list_display = ('system', 'ver', 'creator', 'created')
     list_filter = ['created', 'system']
-    readonly_fields=('ver', )
+    readonly_fields=('ver', 'system')
+    ordering = ('-created',)
+    exclude = ('system', )
 
 class SystemACLAdmin(admin.ModelAdmin):
     list_display = ('system', 'user', 'created', 'modified')

dbdb/core/forms.py

@@ -220,6 +220,13 @@ class SystemVersionEditForm(forms.ModelForm):
         help_text="Separate the urls with commas",
         required=False
     )
+    
+    def clean_twitter_handle(self):
+        data = self.cleaned_data['twitter_handle']
+        if data and data[0] != '@':
+            raise ValidationError("Invalid Twitter handle. Expected to start with '@' character")
+        return data
+    
 
     class Meta:
         model = SystemVersion
@@ -233,6 +240,7 @@ class Meta:
             'source_url',
             'tech_docs',
             'wikipedia_url',
+            'twitter_handle',
             'developer',
             'start_year',
             'start_year_citations',
@@ -283,6 +291,7 @@ class Meta:
             'source_url',
             'tech_docs',
             'wikipedia_url',
+            'twitter_handle',
             'developer',
             'start_year',
             'start_year_citations',

dbdb/core/migrations/0024_systemversion_twitter_handle.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.14 on 2022-01-02 19:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0023_auto_20220102_1437'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='systemversion',
+            name='twitter_handle',
+            field=models.CharField(blank=True, help_text='Twitter account for the database (avoid company account if possible)', max_length=100),
+        ),
+    ]

dbdb/core/models.py

@@ -390,6 +390,10 @@ class SystemVersion(models.Model):
         blank=True, max_length=500,
         verbose_name="Wikipedia URL",
         help_text="URL of Wikipedia article about this system (if available)")
+    
+    twitter_handle = models.CharField(
+        blank=True, max_length=100,
+        help_text="Twitter account for the database (avoid company account if possible)")
 
     class Meta:
         ordering = ('-ver',)
@@ -432,6 +436,9 @@ def update_version(self):
             pass
         return
 
+    def twitter_handle_url(self):
+        return settings.TWITTER_URL + self.twitter_handle.replace('@', '')
+
     def twitter_card_url(self):
         return settings.TWITTER_CARD_URL + self.get_twitter_card_image()
 

dbdb/settings.py

@@ -181,6 +181,7 @@
 # Custom Twitter Cards
 TWITTER_CARD_ROOT = os.path.join(MEDIA_ROOT, 'twitter')
 TWITTER_CARD_URL = MEDIA_URL + "twitter/"
+TWITTER_URL = "https://twitter.com/"
 
 TWITTER_CARD_TEMPLATE = os.path.join(STATIC_ROOT, 'core/images/dbdb_io_card_template.png')
 TWITTER_CARD_BASE_OFFSET_X = 200

templates/core/databases-edit.html

@@ -45,6 +45,7 @@ <h1>Edit Database System</h1>
                         {% bootstrap_field system_version_form.source_url %}
                         {% bootstrap_field system_version_form.tech_docs %}
                         {% bootstrap_field system_version_form.wikipedia_url %}
+                        {% bootstrap_field system_version_form.twitter_handle placeholder='@account_name' %}
                         {% bootstrap_field system_version_form.project_types form_group_class="form-group multi-select" %}
                     </div>
 

templates/core/system_base.html

@@ -183,12 +183,12 @@ <h6 class="card-title">Source Code</h6>
                     <h6 class="card-title">Tech Docs</h6>
                     <p class="card-text"><a href="{{ system_version.tech_docs }}">{{ system_version.tech_docs }}</a></p>
                 {% endif %}
-
-                {% if system_version.former_names %}
-                    <h6 class="card-title">Former Name</h6>
-                    <p class="card-text">{{ system_version.former_names }}</p>
+                    
+                {% if system_version.twitter_handle %}
+                    <h6 class="card-title">Twitter</h6>
+                    <p class="card-text"><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-twitter" viewBox="0 0 16 16"> <path d="M5.026 15c6.038 0 9.341-5.003 9.341-9.334 0-.14 0-.282-.006-.422A6.685 6.685 0 0 0 16 3.542a6.658 6.658 0 0 1-1.889.518 3.301 3.301 0 0 0 1.447-1.817 6.533 6.533 0 0 1-2.087.793A3.286 3.286 0 0 0 7.875 6.03a9.325 9.325 0 0 1-6.767-3.429 3.289 3.289 0 0 0 1.018 4.382A3.323 3.323 0 0 1 .64 6.575v.045a3.288 3.288 0 0 0 2.632 3.218 3.203 3.203 0 0 1-.865.115 3.23 3.23 0 0 1-.614-.057 3.283 3.283 0 0 0 3.067 2.277A6.588 6.588 0 0 1 .78 13.58a6.32 6.32 0 0 1-.78-.045A9.344 9.344 0 0 0 5.026 15z"/></svg> <a target="twitter" href="{{ system_version.twitter_handle_url }}"> {{ system_version.twitter_handle }}</a></p>
                 {% endif %}
-
+                    
                 {% if system_version.developer %}
                     <h6 class="card-title">Developer</h6>
                     <p class="card-text">{{ system_version.developer }}</p>
@@ -237,6 +237,11 @@ <h6 class="card-title">
                         </ul>
                     </cite>
                 {% endif %}
+                    
+                {% if system_version.former_names %}
+                    <h6 class="card-title">Former Name</h6>
+                    <p class="card-text">{{ system_version.former_names }}</p>
+                {% endif %}
 
                 {% if system_version.acquired_by %}
                     <h6 class="card-title">
@@ -313,7 +318,7 @@ <h6 class="card-title">Licenses</h6>
                     <h6 class="card-title">Wikipedia</h6>
                     <p class="card-text"><a target="wikipedia" href="{{ system_version.wikipedia_url }}">{{ system_version.wikipedia_url }}</a></p>
                 {% endif %}
-
+                    
                 </div>
             </div>