permissions for publishing and export action

Author: n0rdlicht

django/gsmap/admin.py

@@ -247,7 +247,7 @@ def make_published(self, request, queryset):
         ) % updated, messages.SUCCESS)
     # todo refactor when upgrading to django 3.2 as action decorator
     make_published.short_description = "Publish selected annotations"
-    make_published.allowed_permissions = ('annotation_publish',)
+    make_published.allowed_permissions = ('publish',)
 
     # @admin_.action(description='Publish selected annotations')
     def make_unpublished(self, request, queryset):
@@ -259,12 +259,12 @@ def make_unpublished(self, request, queryset):
         ) % updated, messages.SUCCESS)
     # todo refactor when upgrading to django 3.2 as action decorator
     make_unpublished.short_description = "Unpublish selected annotations"
-    make_unpublished.allowed_permissions = ('annotation_publish',)
+    make_unpublished.allowed_permissions = ('publish',)
 
-    def has_annotation_publish_permission(self, request):
+    def has_publish_permission(self, request):
         """Does the user have the publish permission?"""
         opts = self.opts
-        codename = get_permission_codename('annotation_publish', opts)
+        codename = get_permission_codename('publish', opts)
         return request.user.has_perm('%s.%s' % (opts.app_label, codename))
 
     def export_as_csv(self, request, queryset):
@@ -300,11 +300,13 @@ def export_as_csv(self, request, queryset):
                 r.data
             ])
         return response
+    export_as_csv.short_description = "Export selected annotations"
+    export_as_csv.allowed_permissions = ('export',)
 
-    def has_annotation_export_permission(self, request):
+    def has_export_permission(self, request):
         """Does the user have the publish permission?"""
         opts = self.opts
-        codename = get_permission_codename('annotation_export', opts)
+        codename = get_permission_codename('export', opts)
         return request.user.has_perm('%s.%s' % (opts.app_label, codename))
 
 class CategoryAdminForm(TranslatableModelForm):

django/gsmap/migrations/0042_auto_20220223_2331.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.1.13 on 2022-02-23 23:31
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gsmap', '0041_auto_20220223_1850'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='annotation',
+            options={'ordering': ['-created'], 'permissions': [('publish_annotation', 'Can publish annotations'), ('export_annotation', 'Can export annotations')]},
+        ),
+    ]

django/gsmap/models.py

@@ -458,6 +458,10 @@ def __str__(self):
 class Annotation(models.Model):
     class Meta:
         ordering = ['-created']
+        permissions = [
+            ('publish_annotation', 'Can publish annotations'),
+            ('export_annotation', 'Can export annotations'),
+        ]
 
     created = models.DateTimeField(auto_now_add=True)
     modified = models.DateTimeField(auto_now=True)
@@ -515,7 +519,7 @@ def email_hash(self):
 
     @property
     def email_hash_short(self):
-        return self.email_hash[:10]
+        return self.email_hash[:12]
 
     @property
     def description(self):