Implement permissions on news tags

mhagander · mhagander · commit 60f75e498ecf · 2020-07-13T14:57:17.000+02:00
This makes it possible to limit which organisations can use specific
tags in news, and verify those as news is submitted. Administrators can,
as always, override.

In passing also add a sortkey field to newstags to make them, well,
sortable.
diff --git a/pgweb/news/admin.py b/pgweb/news/admin.py
@@ -14,6 +14,7 @@ class NewsArticleAdmin(PgwebAdmin):
 
 class NewsTagAdmin(PgwebAdmin):
     list_display = ('urlname', 'name', 'description')
+    filter_horizontal = ('allowed_orgs', )
 
 
 admin.site.register(NewsArticle, NewsArticleAdmin)
diff --git a/pgweb/news/forms.py b/pgweb/news/forms.py
@@ -26,6 +26,21 @@ def described_checkboxes(self):
             'tags': {t.id: t.description for t in NewsTag.objects.all()}
         }
 
+    def clean(self):
+        data = super().clean()
+
+        for t in data['tags']:
+            # Check each tag for permissions. This is not very db-efficient, but people
+            # don't save news articles that often...
+            if t.allowed_orgs.exists() and not t.allowed_orgs.filter(pk=data['org'].pk).exists():
+                self.add_error('tags',
+                               'The organisation {} is not allowed to use the tag {}.'.format(
+                                   data['org'],
+                                   t,
+                               ))
+
+        return data
+
     class Meta:
         model = NewsArticle
         exclude = ('submitter', 'modstate', 'tweeted')
diff --git a/pgweb/news/migrations/0005_tag_permissions.py b/pgweb/news/migrations/0005_tag_permissions.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.27 on 2020-07-04 15:47
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0002_block_oauth'),
+        ('news', '0004_modstate'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='newstag',
+            name='allowed_orgs',
+            field=models.ManyToManyField(blank=True, help_text='Organisations allowed to use this tag', to='core.Organisation'),
+        ),
+        migrations.AddField(
+            model_name='newstag',
+            name='sortkey',
+            field=models.IntegerField(default=100),
+        ),
+        migrations.AlterModelOptions(
+            name='newstag',
+            options={'ordering': ('sortkey', 'urlname', )},
+        )
+    ]
diff --git a/pgweb/news/models.py b/pgweb/news/models.py
@@ -8,12 +8,15 @@ class NewsTag(models.Model):
     urlname = models.CharField(max_length=20, null=False, blank=False, unique=True)
     name = models.CharField(max_length=32, null=False, blank=False)
     description = models.CharField(max_length=200, null=False, blank=False)
+    allowed_orgs = models.ManyToManyField(Organisation, blank=True,
+                                          help_text="Organisations allowed to use this tag")
+    sortkey = models.IntegerField(null=False, blank=False, default=100)
 
     def __str__(self):
         return self.name
 
     class Meta:
-        ordering = ('urlname', )
+        ordering = ('sortkey', 'urlname', )
 
 
 class NewsArticle(TristateModerateModel):
