Begin support for dynamically adding metadata to data sources

datasources/admin.py

@@ -3,6 +3,11 @@ from django.contrib import admin
 from . import forms, models
 
 
+@admin.register(models.MetadataField)
+class MetadataFieldAdmin(admin.ModelAdmin):
+    pass
+
+
 @admin.register(models.DataSource)
 class DataSourceAdmin(admin.ModelAdmin):
     readonly_fields = ['owner']
@@ -36,6 +41,7 @@ class DataSourceAdmin(admin.ModelAdmin):
         """
         try:
             owner = form.instance.owner
+
         except models.DataSource.owner.RelatedObjectDoesNotExist:
             form.instance.owner = request.user
 

datasources/migrations/0016_metadatafield_short_name.py

+# Generated by Django 2.0.8 on 2018-12-07 13:53
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('datasources', '0015_add_dynamic_metadata'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='metadatafield',
+            name='short_name',
+            field=models.CharField(default='', max_length=63, unique=True, validators=[django.core.validators.RegexValidator('^[a-zA-Z][a-zA-Z0-9_]*\\Z', 'Short name must begin with a letter and consist only of letters, numbers and underscores.', 'invalid')]),
+            preserve_default=False,
+        ),
+    ]

datasources/models.py

@@ -4,6 +4,7 @@ import typing
 
 from django.conf import settings
 from django.contrib.auth.models import Group
+from django.core import validators
 from django.db import models
 from django.urls import reverse
 import requests
@@ -25,6 +26,20 @@ class MetadataField(models.Model):
                             unique=True,
                             blank=False, null=False)
 
+    short_name = models.CharField(max_length=MAX_LENGTH_NAME,
+                                  validators=[
+                                      validators.RegexValidator(
+                                          '^[a-zA-Z][a-zA-Z0-9_]*\Z',
+                                          'Short name must begin with a letter and consist only of letters, numbers and underscores.',
+                                          'invalid'
+                                      )
+                                  ],
+                                  unique=True,
+                                  blank=False, null=False)
+
+    def __str__(self):
+        return self.name
+
 
 class MetadataItem(models.Model):
     """
@@ -49,6 +64,9 @@ class MetadataItem(models.Model):
     class Meta:
         unique_together = (('field', 'datasource'),)
 
+    def __str__(self):
+        return self.value
+
 
 @enum.unique
 class UserPermissionLevels(enum.IntEnum):

datasources/templates/datasources/datasource/detail.html

@@ -79,6 +79,30 @@
         </tbody>
     </table>
 
+    <table class="table">
+        <thead>
+        <th scope="col" class="w-25 border-0">Metadata key</th>
+        <th scope="col" class="border-0"></th>
+        </thead>
+
+        <tbody>
+        {% for metadata_item in datasource.metadata_items.all %}
+            <tr>
+                <td>{{ metadata_item.field.name }}</td>
+                <td>{{ metadata_item.value }}</td>
+            </tr>
+        {% endfor %}
+        {% if has_edit_permission %}
+            <form action="{% url 'datasources:datasource.detail' pk=datasource.pk %}">
+                <tr>
+                    <td></td>
+                    <td></td>
+                </tr>
+            </form>
+        {% endif %}
+        </tbody>
+    </table>
+
     <hr>
 
     {% if is_catalogue %}