From a2df31e78bc532dbb5110307458bb6d57853736d Mon Sep 17 00:00:00 2001
From: susanodd <mijnoog@kpnmail.nl>
Date: Thu, 22 Aug 2024 15:58:53 +0200
Subject: [PATCH 01/11] #1270: Signbank empty database.

Modified permissions. Command to empty tables, command to remove users except for developers.
---
 signbank/abstract_machine.py                  |  4 +-
 signbank/context_processors.py                |  2 +-
 signbank/dictionary/adminviews.py             | 69 +++++++++---------
 .../management/commands/create_empty_db.py    | 69 ++++++++++++++++++
 .../commands/delete_users_not_development.py  | 25 +++++++
 signbank/dictionary/models.py                 |  4 +-
 .../dictionary/add_annotated_sentence.html    |  2 +-
 .../templates/dictionary/add_gloss.html       |  4 +-
 .../templates/dictionary/add_lemma.html       |  2 +-
 .../templates/dictionary/add_morpheme.html    |  4 +-
 .../dictionary/add_sentence_video.html        |  2 +-
 .../dictionary/admin_dataset_list.html        |  8 +--
 .../dictionary/admin_dataset_manager.html     |  2 +-
 .../dictionary/admin_dataset_select_list.html |  2 +-
 .../dictionary/admin_lemma_list.html          |  2 +-
 .../dictionary/admin_morpheme_list.html       |  2 +-
 .../templates/dictionary/affiliationtags.html |  4 +-
 .../templates/dictionary/dataset_detail.html  |  4 +-
 .../dictionary/dataset_frequency.html         | 14 ++--
 .../dictionary/edit_annotated_sentence.html   |  2 +-
 .../templates/dictionary/gloss_detail.html    | 58 +++++++--------
 .../templates/dictionary/glosstags.html       |  4 +-
 .../templates/dictionary/morpheme_detail.html |  6 +-
 .../templates/dictionary/morphemetags.html    |  4 +-
 signbank/dictionary/tests.py                  | 70 +++++++++----------
 signbank/dictionary/update.py                 | 32 ++++-----
 signbank/dictionary/views.py                  | 10 +--
 signbank/gloss_morphology_update.py           |  2 +-
 signbank/gloss_update.py                      | 12 ++--
 signbank/manage_videos.py                     |  4 +-
 signbank/registration/views.py                |  8 +--
 signbank/tools.py                             |  2 +-
 32 files changed, 266 insertions(+), 173 deletions(-)
 create mode 100644 signbank/dictionary/management/commands/create_empty_db.py
 create mode 100644 signbank/dictionary/management/commands/delete_users_not_development.py

diff --git a/signbank/abstract_machine.py b/signbank/abstract_machine.py
index 9b364b919..e8e362c1a 100644
--- a/signbank/abstract_machine.py
+++ b/signbank/abstract_machine.py
@@ -335,7 +335,7 @@ def csv_create_gloss(request, datasetid):
     if not dataset or not request.user.is_authenticated:
         return JsonResponse({})
 
-    change_permit_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset)
+    change_permit_datasets = get_objects_for_user(request.user, 'change_permission', Dataset)
     if dataset not in change_permit_datasets:
         return JsonResponse({})
 
@@ -374,7 +374,7 @@ def api_create_gloss(request, datasetid):
         results['errors'] = [gettext("Dataset ID does not exist.")]
         return JsonResponse(results)
 
-    change_permit_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset)
+    change_permit_datasets = get_objects_for_user(request.user, 'change_permission', Dataset)
     if dataset not in change_permit_datasets:
         results['errors'] = [gettext("No change permission for dataset for user ") + str(request.user)]
         return JsonResponse(results)
diff --git a/signbank/context_processors.py b/signbank/context_processors.py
index ced0246fa..544256f4a 100755
--- a/signbank/context_processors.py
+++ b/signbank/context_processors.py
@@ -26,7 +26,7 @@ def url(request):
                 viewable_datasets.append(dataset)
                 continue
             permissions_for_dataset = get_user_perms(request.user, dataset)
-            if 'view_dataset' in permissions_for_dataset or 'can_view_dataset' in permissions_for_dataset:
+            if 'view_permission' in permissions_for_dataset:
                 viewable_datasets.append(dataset)
 
     if 'dark_mode' not in request.session.keys():
diff --git a/signbank/dictionary/adminviews.py b/signbank/dictionary/adminviews.py
index 6f5382000..0b0d74744 100755
--- a/signbank/dictionary/adminviews.py
+++ b/signbank/dictionary/adminviews.py
@@ -414,7 +414,7 @@ def render_to_ecv_export_response(self):
         # make sure the user can write to this dataset
         import guardian
         # from guardian.shortcuts import get_objects_for_user
-        user_change_datasets = guardian.shortcuts.get_objects_for_user(self.request.user, 'change_dataset', Dataset)
+        user_change_datasets = guardian.shortcuts.get_objects_for_user(self.request.user, 'change_permission', Dataset)
         if not user_change_datasets or dataset_object not in user_change_datasets:
             messages.add_message(self.request, messages.ERROR, _('No permission to export dataset.'))
             return HttpResponseRedirect(settings.PREFIX_URL + '/signs/search/')
@@ -851,7 +851,7 @@ def get(self, request, *args, **kwargs):
                 return HttpResponseRedirect(reverse('registration:login'))
 
         dataset_of_requested_gloss = self.object.lemma.dataset
-        datasets_user_can_view = get_objects_for_user(request.user, ['view_dataset', 'can_view_dataset'],
+        datasets_user_can_view = get_objects_for_user(request.user, ['view_permission'],
                                                       Dataset, accept_global_perms=True, any_perm=True)
 
         if dataset_of_requested_gloss not in selected_datasets:
@@ -1292,7 +1292,7 @@ def get_context_data(self, **kwargs):
             context['dataset_choices'] = {}
             user = self.request.user
             if user.is_authenticated:
-                qs = get_objects_for_user(user, ['view_dataset', 'can_view_dataset'], Dataset, accept_global_perms=True, any_perm=True)
+                qs = get_objects_for_user(user, ['view_permission'], Dataset, accept_global_perms=True, any_perm=True)
                 dataset_choices = {}
                 for dataset in qs:
                     dataset_choices[dataset.acronym] = dataset.acronym
@@ -1477,7 +1477,7 @@ def get(self, request, *args, **kwargs):
                 return HttpResponseRedirect(reverse('registration:login'))
 
         dataset_of_requested_gloss = self.object.lemma.dataset
-        datasets_user_can_view = get_objects_for_user(request.user, ['view_dataset', 'can_view_dataset'],
+        datasets_user_can_view = get_objects_for_user(request.user, ['view_permission'],
                                                       Dataset, accept_global_perms=True, any_perm=True)
 
         if dataset_of_requested_gloss not in selected_datasets:
@@ -1586,7 +1586,7 @@ def get(self, request, *args, **kwargs):
                 return HttpResponseRedirect(reverse('registration:login'))
 
         dataset_of_requested_gloss = self.object.lemma.dataset
-        datasets_user_can_view = get_objects_for_user(request.user, ['view_dataset', 'can_view_dataset'],
+        datasets_user_can_view = get_objects_for_user(request.user, ['view_permission'],
                                                       Dataset, accept_global_perms=True, any_perm=True)
 
         if dataset_of_requested_gloss not in selected_datasets:
@@ -2876,7 +2876,7 @@ def get_queryset(self):
             checker.prefetch_perms(qs)
 
             for dataset in qs:
-                checker.has_perm('can_view_dataset', dataset) or checker.has_perm('view_dataset', dataset)
+                checker.has_perm('view_permission', dataset)
 
             return qs
         else:
@@ -2916,7 +2916,7 @@ def get(self, request, *args, **kwargs):
                 return HttpResponseRedirect(reverse('registration:login'))
 
         dataset_of_requested_gloss = self.object.lemma.dataset
-        datasets_user_can_view = get_objects_for_user(request.user, ['view_dataset', 'can_view_dataset'],
+        datasets_user_can_view = get_objects_for_user(request.user, ['view_permission'],
                                                       Dataset, accept_global_perms=True, any_perm=True)
 
         if dataset_of_requested_gloss not in selected_datasets:
@@ -2982,7 +2982,7 @@ def get_context_data(self, **kwargs):
             context['dataset_choices'] = {}
             user = self.request.user
             if user.is_authenticated:
-                qs = get_objects_for_user(user, ['view_dataset', 'can_view_dataset'],
+                qs = get_objects_for_user(user, ['view_permission'],
                                           Dataset, accept_global_perms=True, any_perm=True)
                 dataset_choices = {}
                 for dataset in qs:
@@ -3128,7 +3128,7 @@ def get_context_data(self, **kwargs):
             context['dataset_choices'] = {}
             user = self.request.user
             if user.is_authenticated:
-                qs = get_objects_for_user(user, ['view_dataset', 'can_view_dataset'],
+                qs = get_objects_for_user(user, ['view_permission'],
                                           Dataset, accept_global_perms=True, any_perm=True)
                 dataset_choices = {}
                 for dataset in qs:
@@ -3553,14 +3553,14 @@ def render_to_request_response(self, context):
 
         # make sure the user can write to this dataset
         from guardian.shortcuts import get_objects_for_user, assign_perm
-        user_view_datasets = get_objects_for_user(self.request.user, ['view_dataset', 'can_view_dataset'],
+        user_view_datasets = get_objects_for_user(self.request.user, ['view_permission'],
                                                   Dataset, accept_global_perms=True, any_perm=True)
         may_request_dataset = True
         if dataset_object.is_public and not dataset_object in user_view_datasets:
             # the user currently has no view permission for the requested dataset
             # Give permission to access dataset
             may_request_dataset = True
-            assign_perm('can_view_dataset', self.request.user, dataset_object)
+            assign_perm('view_permission', self.request.user, dataset_object)
             messages.add_message(self.request, messages.INFO,
                                              _('View permission for user successfully granted.'))
         elif not dataset_object.is_public and not dataset_object in user_view_datasets:
@@ -3666,7 +3666,7 @@ def render_to_ecv_export_response(self, context):
 
         # make sure the user can write to this dataset
         # from guardian.shortcuts import get_objects_for_user
-        user_change_datasets = get_objects_for_user(self.request.user, 'change_dataset', Dataset, accept_global_perms=False)
+        user_change_datasets = get_objects_for_user(self.request.user, 'change_permission', Dataset, accept_global_perms=False)
         if not user_change_datasets or dataset_object not in user_change_datasets:
             messages.add_message(self.request, messages.ERROR, _('No permission to export dataset.'))
             return HttpResponseRedirect(reverse('admin_dataset_view'))
@@ -3716,8 +3716,7 @@ def get_queryset(self):
             checker.prefetch_perms(qs)
 
             for dataset in qs:
-                checker.has_perm('can_view_dataset', dataset) or checker.has_perm('view_dataset', dataset)
-
+                checker.has_perm('view_permission', dataset)
             qs = qs.annotate(Count('lemmaidgloss__gloss')).order_by('acronym')
 
             return qs
@@ -3738,7 +3737,7 @@ def get_queryset(self):
             datasets_with_public_glosses = get_datasets_with_public_glosses()
             viewable_datasets = list(
                 set([ds.id for ds in datasets_with_public_glosses]))
-
+            print('view: ', viewable_datasets)
             qs = Dataset.objects.filter(id__in=viewable_datasets)
             datasets_to_choose_from = qs.annotate(checked=ExpressionWrapper(Q(id__in=selected_dataset_ids),
                                                                             output_field=BooleanField())).order_by('acronym')
@@ -3813,7 +3812,7 @@ def check_user_permissions_for_managing_dataset(self, dataset_object):
 
         # make sure the user can write to this dataset
         # from guardian.shortcuts import get_objects_for_user
-        user_change_datasets = get_objects_for_user(self.request.user, 'change_dataset', Dataset,
+        user_change_datasets = get_objects_for_user(self.request.user, 'change_permission', Dataset,
                                                     accept_global_perms=False)
         if not user_change_datasets or dataset_object not in user_change_datasets:
             messages.add_message(self.request, messages.ERROR, _('No permission to modify dataset permissions.'))
@@ -3912,8 +3911,8 @@ def render_to_add_user_response(self, context):
         manage_identifier = 'dataset_' + dataset_object.acronym.replace(' ','')
 
         from guardian.shortcuts import assign_perm, remove_perm
-        datasets_user_can_change = get_objects_for_user(user_object, 'change_dataset', Dataset, accept_global_perms=False)
-        datasets_user_can_view = get_objects_for_user(user_object, ['view_dataset', 'can_view_dataset'],
+        datasets_user_can_change = get_objects_for_user(user_object, 'change_permission', Dataset, accept_global_perms=False)
+        datasets_user_can_view = get_objects_for_user(user_object, ['view_permission'],
                                                       Dataset, accept_global_perms=False, any_perm=True)
         groups_user_is_in = Group.objects.filter(user=user_object)
 
@@ -3929,7 +3928,7 @@ def render_to_add_user_response(self, context):
                 return HttpResponseRedirect(reverse('admin_dataset_manager')+'?'+manage_identifier)
 
             try:
-                assign_perm('can_view_dataset', user_object, dataset_object)
+                assign_perm('view_permission', user_object, dataset_object)
                 messages.add_message(self.request, messages.INFO,
                                  _('View permission for user successfully granted.'))
 
@@ -3986,7 +3985,7 @@ def render_to_add_user_response(self, context):
                 manage_identifier += '_manage_view'
                 return HttpResponseRedirect(reverse('admin_dataset_manager') + '?' + manage_identifier)
             try:
-                assign_perm('change_dataset', user_object, dataset_object)
+                assign_perm('change_permission', user_object, dataset_object)
 
                 # put user in Editor group
                 editor_group = Group.objects.get(name='Editor')
@@ -4016,8 +4015,8 @@ def render_to_add_user_response(self, context):
                     try:
                         # also need to remove change_dataset perm in this case
                         from guardian.shortcuts import remove_perm
-                        remove_perm('can_view_dataset', user_object, dataset_object)
-                        remove_perm('change_dataset', user_object, dataset_object)
+                        remove_perm('view_permission', user_object, dataset_object)
+                        remove_perm('change_permission', user_object, dataset_object)
                         messages.add_message(self.request, messages.INFO,
                                              _('View (and change) permission for user successfully revoked.'))
                     except (PermissionError, SystemError, OSError):
@@ -4039,8 +4038,8 @@ def render_to_add_user_response(self, context):
                 else:
                     # can remove permission
                     try:
-                        remove_perm('change_dataset', user_object, dataset_object)
-                        other_datasets_user_can_change = get_objects_for_user(user_object, 'change_dataset', Dataset,
+                        remove_perm('change_permission', user_object, dataset_object)
+                        other_datasets_user_can_change = get_objects_for_user(user_object, 'change_permission', Dataset,
                                                                             accept_global_perms=True)
                         if len(other_datasets_user_can_change) == 0:
                             # this was the only dataset the user could change
@@ -4183,7 +4182,7 @@ def get_queryset(self):
             checker.prefetch_perms(qs)
 
             for dataset in qs:
-                checker.has_perm('change_dataset', dataset)
+                checker.has_perm('change_permission', dataset)
 
             return qs
         else:
@@ -4388,7 +4387,7 @@ def get_context_data(self, **kwargs):
         selected_datasets = get_selected_datasets_for_user(self.request.user)
 
         managed_datasets = []
-        change_dataset_permission = get_objects_for_user(self.request.user, 'change_dataset', Dataset)
+        change_dataset_permission = get_objects_for_user(self.request.user, 'change_permission', Dataset)
         for dataset in selected_datasets:
             if dataset in change_dataset_permission:
                 dataset_excluded_choices = dataset.exclude_choices.all()
@@ -4513,7 +4512,7 @@ def get_queryset(self):
             checker.prefetch_perms(qs)
 
             for dataset in qs:
-                checker.has_perm('change_dataset', dataset)
+                checker.has_perm('change_permission', dataset)
 
             return qs
         else:
@@ -4615,7 +4614,7 @@ def get(self, request, *args, **kwargs):
             return HttpResponseRedirect(reverse('registration:login'))
 
         dataset = self.object
-        datasets_user_can_view = get_objects_for_user(request.user, ['view_dataset', 'can_view_dataset'],
+        datasets_user_can_view = get_objects_for_user(request.user, ['view_permission'],
                                                       Dataset, accept_global_perms=True, any_perm=True)
 
         if dataset not in datasets_user_can_view:
@@ -4764,7 +4763,7 @@ def render_to_process_speakers_response(self, context):
 
         # make sure the user can write to this dataset
         # from guardian.shortcuts import get_objects_for_user
-        user_change_datasets = get_objects_for_user(self.request.user, 'change_dataset', Dataset, accept_global_perms=False)
+        user_change_datasets = get_objects_for_user(self.request.user, 'change_permission', Dataset, accept_global_perms=False)
         if not user_change_datasets.exists() or dataset_object not in user_change_datasets:
             messages.add_message(self.request, messages.ERROR, _('No permission to import speakers for this dataset.'))
             return HttpResponseRedirect(reverse('admin_dataset_view'))
@@ -4803,7 +4802,7 @@ def render_to_create_corpus_response(self, context):
 
         # make sure the user can write to this dataset
         # from guardian.shortcuts import get_objects_for_user
-        user_change_datasets = get_objects_for_user(self.request.user, 'change_dataset', Dataset, accept_global_perms=False)
+        user_change_datasets = get_objects_for_user(self.request.user, 'change_permission', Dataset, accept_global_perms=False)
         if not user_change_datasets.exists() or dataset_object not in user_change_datasets:
             messages.add_message(self.request, messages.ERROR, _('No permission to create a corpus for this dataset.'))
             return HttpResponseRedirect(reverse('admin_dataset_view'))
@@ -4843,7 +4842,7 @@ def render_to_update_corpus_response(self, context):
 
         # make sure the user can write to this dataset
         # from guardian.shortcuts import get_objects_for_user
-        user_change_datasets = get_objects_for_user(self.request.user, 'change_dataset', Dataset, accept_global_perms=False)
+        user_change_datasets = get_objects_for_user(self.request.user, 'change_permission', Dataset, accept_global_perms=False)
         if not user_change_datasets.exists() or dataset_object not in user_change_datasets:
             messages.add_message(self.request, messages.ERROR, _('No permission to update the corpus for this dataset.'))
             return HttpResponseRedirect(reverse('admin_dataset_view'))
@@ -4956,7 +4955,7 @@ def get(self, request, *args, **kwargs):
                 return HttpResponseRedirect(reverse('registration:login'))
 
         dataset_of_requested_morpheme = self.object.lemma.dataset
-        datasets_user_can_view = get_objects_for_user(request.user, ['view_dataset', 'can_view_dataset'],
+        datasets_user_can_view = get_objects_for_user(request.user, ['view_permission'],
                                                       Dataset, accept_global_perms=False, any_perm=True)
 
         if dataset_of_requested_morpheme not in selected_datasets:
@@ -5201,7 +5200,7 @@ def get_context_data(self, **kwargs):
             context['dataset_choices'] = {}
             user = self.request.user
             if user.is_authenticated:
-                qs = get_objects_for_user(user, ['view_dataset', 'can_view_dataset'],
+                qs = get_objects_for_user(user, ['view_permission'],
                                           Dataset, accept_global_perms=False, any_perm=True)
                 dataset_choices = dict()
                 for dataset in qs:
@@ -6014,7 +6013,7 @@ def post(self, request, *args, **kwargs):
             # the template sets POST value 'delete_lemmas' to value 'delete_lemmas'
             messages.add_message(request, messages.WARNING, _("Incorrect deletion code."))
             return HttpResponseRedirect(reverse('dictionary:admin_lemma_list'))
-        datasets_user_can_change = get_objects_for_user(request.user, 'change_dataset', Dataset,
+        datasets_user_can_change = get_objects_for_user(request.user, 'change_permission', Dataset,
                                                         accept_global_perms=False)
         if not datasets_user_can_change:
             messages.add_message(request, messages.WARNING,
@@ -6355,7 +6354,7 @@ def get(self, request, *args, **kwargs):
             return HttpResponseRedirect(reverse('registration:login'))
 
         dataset_of_requested_lemma = self.object.dataset
-        datasets_user_can_view = get_objects_for_user(request.user, ['view_dataset', 'can_view_dataset'],
+        datasets_user_can_view = get_objects_for_user(request.user, ['view_permission'],
                                                       Dataset, accept_global_perms=False, any_perm=True)
 
         if dataset_of_requested_lemma not in selected_datasets:
diff --git a/signbank/dictionary/management/commands/create_empty_db.py b/signbank/dictionary/management/commands/create_empty_db.py
new file mode 100644
index 000000000..569d5c0a3
--- /dev/null
+++ b/signbank/dictionary/management/commands/create_empty_db.py
@@ -0,0 +1,69 @@
+from django.core.management.base import BaseCommand, CommandError
+from django.conf import settings
+
+from os.path import isfile
+from sqlite3 import connect
+from shutil import copyfile, move
+
+def make_db_small(filename):
+    conn = connect(filename,isolation_level=None)
+    c = conn.cursor()
+
+    # Select all tables in dataset
+    sql_query = """SELECT name FROM sqlite_master WHERE type='table';"""
+    c.execute(sql_query)
+
+    # Set which tables should not be emptied
+    keep_tables = ['auth_group', 'auth_permissions', 
+        'dictionary_corpus', 'dictionary_dataset', 'dictionary_dataset_translation_languages', 
+        'dictionary_derivationhistory', 'dictionary_derivationhistorytranslation', 'dictionary_dialect', 
+        'dictionary_fieldchoice', 'dictionary_handshape', 'dictionary_language', 
+        'dictionary_semanticfield', 'dictionary_semanticfieldtranslation', 
+        'dictionary_signlanguage', 'dictionary_content_type', 
+        'django_migrations', 
+        'pages_page', 'south_migrationhistory', 'tagging_tag',
+                   'auth_group_permissions',
+                   'auth_user_groups',
+                   'auth_user_user_permissions',
+                   'auth_permission',
+                   'auth_user',
+                   'registration_registrationprofile',
+                   'registration_userprofile',
+                   'pages_page_group_required',
+                   'django_site',
+                   'guardian_groupobjectpermission',
+                   'guardian_userobjectpermission',
+                   'dictionary_userprofile'
+                   ]
+    
+    # Empty all other tables
+    for table in c.fetchall():
+        if table[0] not in keep_tables:
+            print('Delete contents from table: ', table[0])
+            c.execute('DELETE FROM ' + table[0] + ';')
+
+    c.execute('VACUUM')
+    conn.commit()
+    conn.close()
+
+
+class Command(BaseCommand):
+    help = 'Creates a smaller faster database for unit tests'
+
+    def handle(self, *args, **options):
+        # find databases
+        source_db = settings.DATABASES['default']['NAME']
+        test_db_filename = settings.DATABASES['default']['TEST']['NAME']
+
+        SMALL = True
+
+        if isfile(test_db_filename):
+            self.stdout.write('Making backup of old test database')
+            move(test_db_filename, test_db_filename + '_save')
+
+        self.stdout.write('Copying database file')
+        copyfile(source_db, test_db_filename)
+
+        if SMALL:
+            self.stdout.write('Emptying tables, for faster tests')
+            make_db_small(test_db_filename)
diff --git a/signbank/dictionary/management/commands/delete_users_not_development.py b/signbank/dictionary/management/commands/delete_users_not_development.py
new file mode 100644
index 000000000..75924c66a
--- /dev/null
+++ b/signbank/dictionary/management/commands/delete_users_not_development.py
@@ -0,0 +1,25 @@
+from django.core.mail import send_mail
+from django.core.management.base import BaseCommand, CommandError
+
+from signbank.settings import base
+from signbank.tools import get_users_without_dataset
+from signbank.dictionary.models import User
+
+class Command(BaseCommand):
+    help = 'Sends a list of all users without a dataset to an email addresss'
+
+    def add_arguments(self, parser):
+        parser.add_argument('address', type=str)
+
+    def handle(self, *args, **options):
+
+        users_without_dataset = User.objects.all()
+
+        if len(users_without_dataset) == 0:
+            return
+
+        for user in users_without_dataset:
+            if user.username not in ['susanodd', 'wessel', 'wesseltest',
+                                     'AnonymousUser', 'DivyaKanekal', 'jetske', 'jetsketest',
+                                     'micha', 'michatest']:
+                user.delete()
diff --git a/signbank/dictionary/models.py b/signbank/dictionary/models.py
index 45d8995c9..9f5239130 100755
--- a/signbank/dictionary/models.py
+++ b/signbank/dictionary/models.py
@@ -3193,7 +3193,7 @@ def get_users_who_can_view_dataset(self):
                                                        with_group_users=False)
         for user in all_users:
             if user in users_who_can_access_me.keys():
-                if 'can_view_dataset' in users_who_can_access_me[user] or 'view_dataset' in users_who_can_access_me[user]:
+                if 'view_permission' in users_who_can_access_me[user]:
                     users_who_can_view_dataset.append(user)
 
         return users_who_can_view_dataset
@@ -3208,7 +3208,7 @@ def get_users_who_can_change_dataset(self):
                                                        with_group_users=False)
         for user in all_users:
             if user in users_who_can_access_me.keys():
-                if 'change_dataset' in users_who_can_access_me[user]:
+                if 'change_permission' in users_who_can_access_me[user]:
                     users_who_can_change_dataset.append(user)
 
         return users_who_can_change_dataset
diff --git a/signbank/dictionary/templates/dictionary/add_annotated_sentence.html b/signbank/dictionary/templates/dictionary/add_annotated_sentence.html
index 8277656e2..ac33eb3f3 100644
--- a/signbank/dictionary/templates/dictionary/add_annotated_sentence.html
+++ b/signbank/dictionary/templates/dictionary/add_annotated_sentence.html
@@ -13,7 +13,7 @@
 {% block content %}
 
 {% get_obj_perms request.user for gloss.lemma.dataset as "dataset_perms" %}
-{% if "change_dataset" in dataset_perms %}
+{% if "change_permission" in dataset_perms %}
 <div class='editform', style="width:500px">
     <fieldset>
         <h4>{% trans "Upload New Annotated Sentence" %}</h4>
diff --git a/signbank/dictionary/templates/dictionary/add_gloss.html b/signbank/dictionary/templates/dictionary/add_gloss.html
index 2ebc8cf43..7fa1ca7dd 100755
--- a/signbank/dictionary/templates/dictionary/add_gloss.html
+++ b/signbank/dictionary/templates/dictionary/add_gloss.html
@@ -26,7 +26,7 @@
         var permission = 0;
         {% for s_dataset in selected_datasets %}
         {% get_obj_perms request.user for s_dataset as "dataset_perms" %}
-        {% if "change_dataset" in dataset_perms %}
+        {% if "change_permission" in dataset_perms %}
         permission += 1;
         {% endif %}
         {% endfor %}
@@ -99,7 +99,7 @@
                  <td class='td td-light'><select id="id_dataset" name="dataset" required="">
                          {% for s_dataset in selected_datasets %}
                          {% get_obj_perms request.user for s_dataset as "dataset_perms" %}
-                         {% if "change_dataset" in dataset_perms %}
+                         {% if "change_permission" in dataset_perms %}
                          {% if last_used_dataset and last_used_dataset == s_dataset.acronym %}
                          <option value="{{ s_dataset.id }}" selected="selected"
                                  dataset_languages="{% for dataset_lang in s_dataset.translation_languages.all %}{{ dataset_lang.language_code_2char }}{% if not forloop.last %},{% endif %}{% endfor %}">{{ s_dataset.acronym }}</option>
diff --git a/signbank/dictionary/templates/dictionary/add_lemma.html b/signbank/dictionary/templates/dictionary/add_lemma.html
index 7be3ffcc9..cae120813 100755
--- a/signbank/dictionary/templates/dictionary/add_lemma.html
+++ b/signbank/dictionary/templates/dictionary/add_lemma.html
@@ -58,7 +58,7 @@
                  <td class='td td-light'><select id="id_dataset" name="dataset" required="">
                          {% for s_dataset in selected_datasets %}
                          {% get_obj_perms request.user for s_dataset as "dataset_perms" %}
-                         {% if "change_dataset" in dataset_perms %}
+                         {% if "change_permission" in dataset_perms %}
                          {% if last_used_dataset and last_used_dataset == s_dataset.acronym %}
                          <option value="{{ s_dataset.id }}" selected="selected"
                                  dataset_languages="{% for dataset_lang in s_dataset.translation_languages.all %}{{ dataset_lang.language_code_2char }}{% if not forloop.last %},{% endif %}{% endfor %}">{{ s_dataset.acronym }}</option>
diff --git a/signbank/dictionary/templates/dictionary/add_morpheme.html b/signbank/dictionary/templates/dictionary/add_morpheme.html
index 72095237b..fa0287e8a 100644
--- a/signbank/dictionary/templates/dictionary/add_morpheme.html
+++ b/signbank/dictionary/templates/dictionary/add_morpheme.html
@@ -18,7 +18,7 @@
         var permission = 0;
         {% for s_dataset in selected_datasets %}
         {% get_obj_perms request.user for s_dataset as "dataset_perms" %}
-        {% if "change_dataset" in dataset_perms %}
+        {% if "change_permission" in dataset_perms %}
         permission += 1;
         {% endif %}
         {% endfor %}
@@ -82,7 +82,7 @@
 
                          {% for s_dataset in selected_datasets %}
                          {% get_obj_perms request.user for s_dataset as "dataset_perms" %}
-                         {% if "change_dataset" in dataset_perms %}
+                         {% if "change_permission" in dataset_perms %}
                          {% if last_used_dataset and last_used_dataset == s_dataset.acronym %}
                          <option value="{{ s_dataset.id }}" selected="selected"
                                  dataset_languages="{% for dataset_lang in s_dataset.translation_languages.all %}{{ dataset_lang.language_code_2char }}{% if not forloop.last %},{% endif %}{% endfor %}">{{ s_dataset.acronym }}</option>
diff --git a/signbank/dictionary/templates/dictionary/add_sentence_video.html b/signbank/dictionary/templates/dictionary/add_sentence_video.html
index 845bf98a8..313e51d61 100644
--- a/signbank/dictionary/templates/dictionary/add_sentence_video.html
+++ b/signbank/dictionary/templates/dictionary/add_sentence_video.html
@@ -15,7 +15,7 @@
 {% block content %}
 
 {% get_obj_perms request.user for gloss.lemma.dataset as "dataset_perms" %}
-{% if "change_dataset" in dataset_perms %}
+{% if "change_permission" in dataset_perms %}
 <div class='editform', style="width:500px">
     <fieldset>
         <legend>{% trans "Upload New Example Sentence Video" %}</legend>
diff --git a/signbank/dictionary/templates/dictionary/admin_dataset_list.html b/signbank/dictionary/templates/dictionary/admin_dataset_list.html
index 15ef52b96..526268520 100644
--- a/signbank/dictionary/templates/dictionary/admin_dataset_list.html
+++ b/signbank/dictionary/templates/dictionary/admin_dataset_list.html
@@ -55,7 +55,7 @@ <h3>{% trans "Available Datasets" %}</h3>
             {% if not user.is_anonymous %}
             <td>
                 {% get_obj_perms request.user for dataset as "dataset_perms" %}
-                {% if "view_dataset" in dataset_perms or "can_view_dataset" in dataset_perms %}
+                {% if "view_permission" in dataset_perms %}
                 {% trans "Yes" %}
                 {% else %}
                 {% trans "No" %}
@@ -63,7 +63,7 @@ <h3>{% trans "Available Datasets" %}</h3>
             </td>
             <td>
                 {% get_obj_perms request.user for dataset as "dataset_perms" %}
-                {% if "change_dataset" in dataset_perms %}
+                {% if "change_permission" in dataset_perms %}
                 {% trans "Yes" %}
                 {% else %}
                 {% trans "No" %}
@@ -72,7 +72,7 @@ <h3>{% trans "Available Datasets" %}</h3>
             <td>
                 {% if dataset.is_public %}
                 {% get_obj_perms request.user for dataset as "dataset_perms" %}
-                {% if not "view_dataset" in dataset_perms or not "can_view_dataset" in dataset_perms %}
+                {% if not "view_permission" in dataset_perms %}
 
                 <div data-toggle="collapse" href="#dataset_{{dataset.name|cut:' '}}_request_view"><button>{% trans "Request View Access" %}</button></div>
                 <div id='dataset_{{dataset.name|cut:" "}}_request_view' class='collapse'>
@@ -104,7 +104,7 @@ <h3>{% trans "Available Datasets" %}</h3>
 
             <td>
                 {% get_obj_perms request.user for dataset as "dataset_perms" %}
-                {% if "change_dataset" in dataset_perms and dataset.lemmaidgloss__gloss__count %}
+                {% if "change_permission" in dataset_perms and dataset.lemmaidgloss__gloss__count %}
                 <form name='export_ecv_form' id='export_ecv_form' method='get'>
                     <div class="hidden">
                         <input name='dataset_acronym' class='form-control' value='{{dataset.acronym}}' >
diff --git a/signbank/dictionary/templates/dictionary/admin_dataset_manager.html b/signbank/dictionary/templates/dictionary/admin_dataset_manager.html
index a17b6d094..dc6979944 100644
--- a/signbank/dictionary/templates/dictionary/admin_dataset_manager.html
+++ b/signbank/dictionary/templates/dictionary/admin_dataset_manager.html
@@ -107,7 +107,7 @@ <h3>{% trans "Manage Datasets" %}</h3>
       {% for dataset in object_list %}
       {% if request.user|has_group:"Dataset_Manager" %}
       {% get_obj_perms request.user for dataset as "dataset_perms" %}
-      {% if "change_dataset" in dataset_perms %}
+      {% if "change_permission" in dataset_perms %}
         <tr style="z-index:0;">
             <td>
                 <table class="table table-condensed">
diff --git a/signbank/dictionary/templates/dictionary/admin_dataset_select_list.html b/signbank/dictionary/templates/dictionary/admin_dataset_select_list.html
index c55f146df..3aeb897f9 100644
--- a/signbank/dictionary/templates/dictionary/admin_dataset_select_list.html
+++ b/signbank/dictionary/templates/dictionary/admin_dataset_select_list.html
@@ -50,7 +50,7 @@ <h3>{% trans "Select Datasets" %}</h3>
     <tbody class="tbody tbody-light">
       {% for dataset in object_list %}
           {% get_obj_perms request.user for dataset as "dataset_perms" %}
-            {% if "view_dataset" in dataset_perms or "can_view_dataset" in dataset_perms %}
+            {% if "view_permission" in dataset_perms %}
             <tr>
                 <td class='td td-light'><input type="checkbox" name="dataset_{{ dataset.acronym }}" value="true" {% if dataset.user.0.user %}checked{% endif %}/></td>
                 <td class='td td-light'>
diff --git a/signbank/dictionary/templates/dictionary/admin_lemma_list.html b/signbank/dictionary/templates/dictionary/admin_lemma_list.html
index fbec887a1..729dbb6d5 100644
--- a/signbank/dictionary/templates/dictionary/admin_lemma_list.html
+++ b/signbank/dictionary/templates/dictionary/admin_lemma_list.html
@@ -261,7 +261,7 @@ <h3>{% trans "Lemmas" %}</h3>
             </td>
             <td>
             {% get_obj_perms request.user for lemma.dataset as "dataset_perms" %}
-            {% if "change_dataset" in dataset_perms %}
+            {% if "change_permission" in dataset_perms %}
                 <a class="change-entry" href="{% url 'dictionary:change_lemma' lemma.pk %}" >
                     <span class="glyphicon glyphicon-pencil" data-toggle="tooltip" data-original-title="{% trans 'Update' %}"></span>
                 </a>
diff --git a/signbank/dictionary/templates/dictionary/admin_morpheme_list.html b/signbank/dictionary/templates/dictionary/admin_morpheme_list.html
index 767cb56ed..96215d69b 100755
--- a/signbank/dictionary/templates/dictionary/admin_morpheme_list.html
+++ b/signbank/dictionary/templates/dictionary/admin_morpheme_list.html
@@ -521,7 +521,7 @@
                          {% for s_dataset in selected_datasets %}
 
                          {% get_obj_perms request.user for s_dataset as "dataset_perms" %}
-                         {% if "change_dataset" in dataset_perms %}
+                         {% if "change_permission" in dataset_perms %}
                          {% if last_used_dataset and last_used_dataset == s_dataset.acronym %}
                          <option value="{{s_dataset.id}}" selected="selected"
                                  dataset_languages="{% for dataset_lang in s_dataset.translation_languages.all %}{{dataset_lang.language_code_2char}}{% if not forloop.last %},{% endif %}{% endfor %}">{{s_dataset.acronym}}</option>
diff --git a/signbank/dictionary/templates/dictionary/affiliationtags.html b/signbank/dictionary/templates/dictionary/affiliationtags.html
index ba29f040b..6dccc3b67 100644
--- a/signbank/dictionary/templates/dictionary/affiliationtags.html
+++ b/signbank/dictionary/templates/dictionary/affiliationtags.html
@@ -13,7 +13,7 @@
                <div class='aff tagAFF' style="background:{{aff.field_color}};border-color:{{aff.field_color}};">
                  <span class='affname'>{{aff.acronym}}</span>
                 {% get_obj_perms request.user for gloss.dataset as "dataset_perms" %}
-                {% if "change_dataset" in dataset_perms %}
+                {% if "change_permission" in dataset_perms %}
                  <span class='affcount'>
                      <a class='affdelete editform'
                         id='{{aff.id}}' value='{{aff.id}}' name='{{aff.acronym}}'
@@ -28,7 +28,7 @@
       {% endif %}
       {% endwith %}
     {% get_obj_perms request.user for gloss.dataset as "dataset_perms" %}
-    {% if "change_dataset" in dataset_perms %}
+    {% if "change_permission" in dataset_perms %}
       <div id="affcontainer"></div>
       <div class='editform'>
           <form id='affaddform'
diff --git a/signbank/dictionary/templates/dictionary/dataset_detail.html b/signbank/dictionary/templates/dictionary/dataset_detail.html
index 3472b5015..b2adeee4e 100644
--- a/signbank/dictionary/templates/dictionary/dataset_detail.html
+++ b/signbank/dictionary/templates/dictionary/dataset_detail.html
@@ -57,7 +57,7 @@ <h3>{% trans "Dataset Details" %}</h3>
 
     <div class='pull-right'>
         {% get_obj_perms request.user for dataset as "dataset_perms" %}
-        {% if "change_dataset" in dataset_perms %}
+        {% if "change_permission" in dataset_perms %}
         {% if request.user|has_group:"Dataset_Manager" %}
          <span id='edit_message' style="padding-right: 1.8em;"></span>
          <button id='enable_edit' class='btn btn-default navbar-btn'>{% trans "Edit" %}</button>
@@ -91,7 +91,7 @@ <h3>{% trans "Dataset Details" %}</h3>
                     {% endif %}
                 {% endfor %}
                 {% get_obj_perms request.user for dataset as "dataset_perms" %}
-                {% if "change_dataset" in dataset_perms %}
+                {% if "change_permission" in dataset_perms %}
                 {% if request.user|has_group:"Dataset_Manager" %}
                     <form name='add_owner_form' id='add_owner_form' method='get'>
                         <table class='table table-condensed' style="background: transparent;">
diff --git a/signbank/dictionary/templates/dictionary/dataset_frequency.html b/signbank/dictionary/templates/dictionary/dataset_frequency.html
index 51908913a..a1ca3121e 100644
--- a/signbank/dictionary/templates/dictionary/dataset_frequency.html
+++ b/signbank/dictionary/templates/dictionary/dataset_frequency.html
@@ -198,7 +198,7 @@ <h3>{% trans "Dataset Corpus Overview" %}</h3>
     </table>
         {% if dataset.get_metadata_path and dataset.uploaded_eafs %}
         {% get_obj_perms request.user for dataset as "dataset_perms" %}
-        {% if "change_dataset" in dataset_perms %}
+        {% if "change_permission" in dataset_perms %}
         {% if not corpus %}
         <form name='create_corpus_form' id='create_corpus_form' method='get'>
             <div class="hidden">
@@ -289,7 +289,7 @@ <h3>{% trans "Dataset Corpus Overview" %}</h3>
             <td>
             {% if request.user|has_group:"Dataset_Manager" %}
             {% get_obj_perms request.user for dataset as "dataset_perms" %}
-            {% if "change_dataset" in dataset_perms %}
+            {% if "change_permission" in dataset_perms %}
             <form name='process_speakers_form' id='process_speakers_form' method='get'>
                 <div class="hidden">
                     <input name='dataset_name' class='form-control form-control-light' value='{{dataset.acronym}}' >
@@ -325,7 +325,7 @@ <h3>{% trans "Dataset Corpus Overview" %}</h3>
                       <dd class="col-sm-2">
                            {% if request.user|has_group:"Dataset_Manager" %}
                            {% get_obj_perms request.user for dataset as "dataset_perms" %}
-                           {% if "change_dataset" in dataset_perms %}
+                           {% if "change_permission" in dataset_perms %}
                            {% csrf_token %}
                            <input type='hidden' name='sourceid' value='{{gloss.pk}}'>
                                     <div class='btn-group' >
@@ -382,7 +382,7 @@ <h3>{% trans "Dataset Corpus Overview" %}</h3>
                           <dt class="col-sm-6">{% trans "PATH" %}</dt>
                           {% if request.user|has_group:"Dataset_Manager" %}
                           {% get_obj_perms request.user for dataset as "dataset_perms" %}
-                          {% if "change_dataset" in dataset_perms %}
+                          {% if "change_permission" in dataset_perms %}
                           <dt class="col-sm-2">{% trans "DELETE" %}</dt>
                           {% endif %}
                           {% endif %}
@@ -405,7 +405,7 @@ <h3>{% trans "Dataset Corpus Overview" %}</h3>
                         <dd class="col-sm-6" >{{path}}</dd>
                            {% if request.user|has_group:"Dataset_Manager" %}
                            {% get_obj_perms request.user for dataset as "dataset_perms" %}
-                           {% if "change_dataset" in dataset_perms %}
+                           {% if "change_permission" in dataset_perms %}
                             <dd class="col-sm-2" id='{{dataset.acronym}}_{{document_identifier}}_{{path}}' value=''
                                 name="{{dataset.acronym}}_{{document_identifier}}_{{path}}">
                                     <input type="checkbox" name="select_document:{{path}}"
@@ -428,7 +428,7 @@ <h3>{% trans "Dataset Corpus Overview" %}</h3>
     {% if dataset.get_metadata_path and dataset.uploaded_eafs %}
     {% if request.user|has_group:"Dataset_Manager" %}
     {% get_obj_perms request.user for dataset as "dataset_perms" %}
-    {% if "change_dataset" in dataset_perms %}
+    {% if "change_permission" in dataset_perms %}
     <button id='remove_eafs_btn'
             {% if duplicates %}
             class='btn btn-danger'
@@ -488,7 +488,7 @@ <h3 id='modalRemoveEafs'>{% trans "Remove EAF Files" %}</h3>
     {% if dataset.get_metadata_path and dataset.uploaded_eafs %}
     {% if request.user|has_group:"Dataset_Manager" %}
     {% get_obj_perms request.user for dataset as "dataset_perms" %}
-    {% if "change_dataset" in dataset_perms %}
+    {% if "change_permission" in dataset_perms %}
     <button id='refresh_all_btn' class='btn btn-primary' data-toggle='modal' data-target='#refresh_all_modal'>{% trans "Refresh All Documents" %}</button>
 
     <div class="modal fade" id="refresh_all_modal" tabindex="-1" role="dialog" aria-labelledby="#modalRefreshAll" aria-hidden="true">
diff --git a/signbank/dictionary/templates/dictionary/edit_annotated_sentence.html b/signbank/dictionary/templates/dictionary/edit_annotated_sentence.html
index bb800bc80..7d7b191b3 100644
--- a/signbank/dictionary/templates/dictionary/edit_annotated_sentence.html
+++ b/signbank/dictionary/templates/dictionary/edit_annotated_sentence.html
@@ -10,7 +10,7 @@
 {% block content %}
 
 {% get_obj_perms request.user for gloss.lemma.dataset as "dataset_perms" %}
-{% if "change_dataset" in dataset_perms %}
+{% if "change_permission" in dataset_perms %}
 <div class='editform', style="width:1000px">
     <fieldset>
         <legend>{% trans "Edit Annotated Sentence" %}</legend>
diff --git a/signbank/dictionary/templates/dictionary/gloss_detail.html b/signbank/dictionary/templates/dictionary/gloss_detail.html
index 1c1d245c4..8fe32e7b3 100755
--- a/signbank/dictionary/templates/dictionary/gloss_detail.html
+++ b/signbank/dictionary/templates/dictionary/gloss_detail.html
@@ -512,7 +512,7 @@ <h3 id='modalQuery'>
     </ul>
     </div>
     
-    {% if "change_dataset" in dataset_perms %}
+    {% if "change_permission" in dataset_perms %}
     <div class='pull-right' style="margin-right:15px;margin-top:10px;">
 
          <span id='edit_message' style="padding-right: 1.8em;"></span>
@@ -549,7 +549,7 @@ <h2 id='modalGlossCopy'>{% trans "Copy Gloss" %}</h2>
                              <td><span>
                                  {% for s_dataset in selected_datasets %}
                                  {% get_obj_perms request.user for s_dataset as "dataset_perms" %}
-                                 {% if "change_dataset" in dataset_perms %}
+                                 {% if "change_permission" in dataset_perms %}
                                  {% if gloss.lemma.dataset == s_dataset or last_used_dataset == s_dataset.acronym %}
                                 <input type="radio" name="dataset"
                                        id="dataset_{{s_dataset.id}}" value="{{s_dataset.id}}" checked>
@@ -631,7 +631,7 @@ <h4>{{annotation}}</h4>
                              <td><span>
                                  {% for s_dataset in selected_datasets %}
                                  {% get_obj_perms request.user for s_dataset as "dataset_perms" %}
-                                 {% if "change_dataset" in dataset_perms %}
+                                 {% if "change_permission" in dataset_perms %}
                                  {% if gloss.lemma.dataset == s_dataset or last_used_dataset == s_dataset.acronym %}
                                 <input type="radio" name="dataset"
                                        id="dataset_{{s_dataset.id}}" value="{{s_dataset.id}}" checked>
@@ -663,7 +663,7 @@ <h4>{{annotation}}</h4>
 
 </div>
 
-        {% if "change_dataset" in dataset_perms %}
+        {% if "change_permission" in dataset_perms %}
         <div class="modal fade" id="delete_gloss_modal" tabindex="-1" role="dialog" aria-labelledby="#modalTitleDelete" aria-hidden="true">
              <div class="modal-dialog modal-lg left-modal">
                 <div class="modal-content">
@@ -735,7 +735,7 @@ <h4>{% trans "Sign" %}: {{annotation}}</h4>
         {% endif %}
     </div>
 
-    {% if "change_dataset" in dataset_perms %}
+    {% if "change_permission" in dataset_perms %}
     <div class='editform'>
         <fieldset>
             <h4>{% trans "Upload New Video" %}</h4>
@@ -859,7 +859,7 @@ <h4>{% trans "Upload New Citation Form Image" %}</h4>
     </div>
     {% endif %}
 
-    {% if gloss.has_video and "change_dataset" in dataset_perms %}
+    {% if gloss.has_video and "change_permission" in dataset_perms %}
         <div class="editform">
             <h4>{% trans "Create Citation Form Image from Current Video" %}</h4>
             <a href="{% url 'dictionary:create_citation_image'  gloss.id %}" class="btn btn-primary">Create</a>
@@ -867,7 +867,7 @@ <h4>{% trans "Create Citation Form Image from Current Video" %}</h4>
 
     {% endif %}
 
-    {% if "change_dataset" in dataset_perms %}
+    {% if "change_permission" in dataset_perms %}
     <div class="editform">
         <fieldset>
          <h4>{% trans "Delete Media" %}</h4>
@@ -885,7 +885,7 @@ <h4>{% trans "Delete Media" %}</h4>
     </div>
     {% endif %}
 
-     {% if "change_dataset" in dataset_perms %}
+     {% if "change_permission" in dataset_perms %}
     <div class="editform">
         <fieldset>
          <h4>{% trans "Delete Sign" %}</h4>
@@ -1020,7 +1020,7 @@ <h4>{% trans "Delete Sign" %}</h4>
                     <table class='table table-condensed' style="table-layout: fixed">
                         {% for sense in senses %}
                             <tr>
-                                {% if "change_dataset" in dataset_perms %}
+                                {% if "change_permission" in dataset_perms %}
                                 <td style="width:20px">
                                         {% if not forloop.first %}  
                                         <span class='sense-icon'><a href='{% url "dictionary:sort_sense" gloss.id forloop.counter "up" %}' style="color:red;">&#x25B2;</a></span>
@@ -1043,7 +1043,7 @@ <h4>{% trans "Delete Sign" %}</h4>
                                     {% endif %}<br><br>
                                 </td>
                                 <td style="width:50px">
-                                    {% if "change_dataset" in dataset_perms %}
+                                    {% if "change_permission" in dataset_perms %}
                                         <span class='glyphicon glyphicon-trash sense_delete sense-icon pull-right' style="color:red"  data-toggle='modal' data-target='#delete_sense_modal_{{sense.id}}'></span>
                                         <div class="modal fade modal-sense" id="delete_sense_modal_{{sense.id}}" role="dialog" aria-labelledby="#modalTitleDeleteSense" aria-hidden="true">
                                             <div class="modal-dialog modal-lg left-modal">
@@ -1183,7 +1183,7 @@ <h2 id='modalTitleSimilarSense'>{% trans "Similar senses" %}</h2>
                                     <table class='table table-condensed' style="table-layout: fixed">
                                         {% for examplesentence in sense.ordered_examplesentences %}
                                             <tr>
-                                                {% if "change_dataset" in dataset_perms %}
+                                                {% if "change_permission" in dataset_perms %}
                                                 <td style="width:20px">
                                                     {% if not forloop.first %}  
                                                     <span class='sense-icon'><a href='{% url "dictionary:sort_examplesentence" sense.id gloss.id forloop.counter "up" %}' style="color:red;">&#x25B2;</a></span>
@@ -1211,7 +1211,7 @@ <h2 id='modalTitleSimilarSense'>{% trans "Similar senses" %}</h2>
                                                     {% if examplesentence.has_video %}
                                                         <span class="pull-right"><img data-target="#exampleVidModal_{{examplesentence.id}}" data-toggle="modal" src='{{STATIC_URL}}images/playvideo.png' style="width:25px; height:25px; margin: 0px; cursor: pointer;"></span>
                                                     {% endif %}
-                                                    {% if "change_dataset" in dataset_perms %}
+                                                    {% if "change_permission" in dataset_perms %}
                                                         <span class = "sense-icon pull-right"><a href='{% url "dictionary:add_sentence_video" glossid=gloss.id examplesentenceid=examplesentence.id %}'><img src='{{STATIC_URL}}images/addvideo.png' style="width:25px; height:25px; margin: 0px; cursor: pointer;"></a></span>
                                                         {% if examplesentence.has_video %}
                                                             <span class="sense-icon pull-right">
@@ -1311,7 +1311,7 @@ <h2 id='modalTitleEditExamplestc'>{% trans "Edit an example sentence" %}</h2>
                                                 </div> 
                                             </div>
                                         {% endfor %}  
-                                        {% if "change_dataset" in dataset_perms %}
+                                        {% if "change_permission" in dataset_perms %}
                                             <tr class="sense-icon">
                                                 <td>
                                                     <button data-toggle='modal' data-target='#add_examplestc_modal_{{sense.id}}', class='sense-button btn btn-primary btn-space'>{% trans "Add an example sentence" %}</button>
@@ -1355,7 +1355,7 @@ <h2 id='modalTitleAddExamplestc'>{% trans "Add an example sentence" %}</h2>
                                 </td>
                             </tr>
                         {% endfor %}
-                        {% if "change_dataset" in dataset_perms %}
+                        {% if "change_permission" in dataset_perms %}
                             <tr class="sense-icon">
                                 <td>
                                     <button data-toggle='modal' data-target='#add_sense_modal_{{gloss.id}}', class='sense-button btn btn-primary btn-space sense-button sense_add'>{% trans "Add a sense" %}</button>
@@ -1493,7 +1493,7 @@ <h2 id='modalDeleteNME'>{% trans "Delete NME Video" %}</h2>
             {% endif %}
             </div>
 
-            {% if "change_dataset" in dataset_perms %}
+            {% if "change_permission" in dataset_perms %}
             <div class='editform' style="width:800px;height:800px;">
                 <fieldset>
                     <h4>{% trans "Upload New NME Video" %}</h4>
@@ -1562,7 +1562,7 @@ <h4>{% trans "Upload New NME Video" %}</h4>
                    {% for morphdef, translated_role, sign_display in morphdefs %}
 
                    <tr>
-                       {% if "change_dataset" in dataset_perms %}
+                       {% if "change_permission" in dataset_perms %}
                          <td style='width:2em;'>
                             <span class='glyphicon glyphicon-trash morphology-definition-delete' data-toggle='modal' data-target='#delete_morphology-definition_modal_{{morphdef.id}}'></span>
 
@@ -1604,7 +1604,7 @@ <h2 id='modalTitleComp'>{% trans "Delete This Compound Part" %}</h2>
            </tbody>
            </table>
 
-            {% if "change_dataset" in dataset_perms %}
+            {% if "change_permission" in dataset_perms %}
             <form name="add_morphologydefinition_form" id='add_morphologydefinition_form'
                   onsubmit='return validateForm("add_morphologydefinition_form","morpheme_id","parent_gloss_id",
                                                 "Please choose a gloss for Add Component Morphology.",
@@ -1653,7 +1653,7 @@ <h2 id='modalTitleComp'>{% trans "Delete This Compound Part" %}</h2>
                 {% for morpheme, morph_display, morpheme_type in simultaneous_morphology %}
                 <tr>
                     <!-- Facility to delete this morpheme -->
-                    {% if "change_dataset" in dataset_perms %}
+                    {% if "change_permission" in dataset_perms %}
                      <td>
                         <span class='glyphicon glyphicon-trash morpheme-definition-delete' data-toggle='modal' data-target='#delete_morpheme-definition_modal_{{morpheme.pk}}'></span>
 
@@ -1692,7 +1692,7 @@ <h2 id='modalTitleMrp'>{% trans "Delete This Morpheme" %}</h2>
             </table>
 
             <!-- Facilitate adding and deleting morphemes that are used in this sign -->
-            {% if "change_dataset" in dataset_perms %}
+            {% if "change_permission" in dataset_perms %}
             {% if count_morphemes_in_dataset %}
             <form name='add_morphemedefinition_form' id='add_morphemedefinition_form'
                   onsubmit='return validateForm("add_morphemedefinition_form","morph_id","host_gloss_id",
@@ -1730,7 +1730,7 @@ <h2 id='modalTitleMrp'>{% trans "Delete This Morpheme" %}</h2>
                 {% for blend, blend_display in blend_morphology %}
                 <tr>
                     <!-- Facility to delete this blend -->
-                    {% if "change_dataset" in dataset_perms %}
+                    {% if "change_permission" in dataset_perms %}
                      <td>
                         <span class='glyphicon glyphicon-trash blend-definition-delete' data-toggle='modal'
                               data-target='#delete_blend-definition_modal_{{blend.pk}}'></span>
@@ -1771,7 +1771,7 @@ <h2 id='modalTitleBlend'>{% trans "Delete This Blend" %}</h2>
             </table>
 
             <!-- Facilitate adding and deleting blends that are used in this sign -->
-            {% if "change_dataset" in dataset_perms %}
+            {% if "change_permission" in dataset_perms %}
             <form name='add_blenddefinition_form' id='add_blenddefinition_form'
                   onsubmit='return validateForm("add_blenddefinition_form","blend_id","host_gloss_id",
                                                 "Please choose a gloss for Add Blend Morphology.",
@@ -2077,7 +2077,7 @@ <h2 id='modalTitleBlend'>{% trans "Delete This Blend" %}</h2>
            <table class='table table-condensed' style="z-index:1000;">
                {% for rel, target_display in otherrelations %}
                <tr id='row_{{rel.id}}'>
-               {% if "change_dataset" in dataset_perms %}
+               {% if "change_permission" in dataset_perms %}
 
                      <td style='width:2em;'>
                         <span class='glyphicon glyphicon-trash relation_delete' data-toggle='modal' data-target='#delete_relation_modal_{{rel.id}}'></span>
@@ -2119,7 +2119,7 @@ <h2 id='modalTitleRel'>{% trans "Delete This Relation" %}</h2>
                {% endfor %}
            </table>
 
-           {% if "change_dataset" in dataset_perms %}
+           {% if "change_permission" in dataset_perms %}
            <form name='add_relation_form' id='add_relation_form'
                  onsubmit='return validateForm("add_relation_form","targetid","sourceid",
                                                 "Please choose a target gloss for Add Relation to Other Sign.",
@@ -2167,7 +2167,7 @@ <h2 id='modalTitleRel'>{% trans "Delete This Relation" %}</h2>
 		            </tr>
                    {% for rel in gloss.relationtoforeignsign_set.all %}
                     <tr id='foreign_{{rel.id}}'>
-                    {% if "change_dataset" in dataset_perms %}
+                    {% if "change_permission" in dataset_perms %}
 
                      <td style='width:1em;'>
                         <span class='glyphicon glyphicon-trash relationtoforeignsign_delete' data-toggle='modal' data-target='#delete_foreignrelation_modal_{{rel.id}}'></span>
@@ -2208,7 +2208,7 @@ <h2 id='modalTitleForeign'>{% trans "Delete This Relation" %}</h2>
                    {% endfor %}
                </table>
 
-               {% if "change_dataset" in dataset_perms %}
+               {% if "change_permission" in dataset_perms %}
                <form id='add_relationtoforeignsign_form' method='post' action='{% url "dictionary:add_relationtoforeignsign" %}'>
                    {% csrf_token %}
                    <input type='hidden' name='sourceid' value='{{gloss.pk}}'>
@@ -2295,7 +2295,7 @@ <h2 id='modalTitleForeign'>{% trans "Delete This Relation" %}</h2>
               <tr>
                 <td>
 
-                   {% if "change_dataset" in dataset_perms %}
+                   {% if "change_permission" in dataset_perms %}
                     {% if not def.published and perms.dictionary.can_delete_unpublished or def.published and perms.dictionary.can_delete_published %}
                     <span class='glyphicon glyphicon-trash definition_delete' data-toggle='modal' data-target='#delete_definition_modal_{{def.id}}'></span>
 
@@ -2336,7 +2336,7 @@ <h2 id='modalTitleNote'>{% trans "Delete This Note" %}</h2>
             {% endfor %}
             </table>
 
-           {% if "change_dataset" in dataset_perms %}
+           {% if "change_permission" in dataset_perms %}
             <form id='add_definition' action='{% url "dictionary:add_definition" gloss.id %}' method="POST">
                 <fieldset>
                 {% csrf_token %}
@@ -2491,7 +2491,7 @@ <h2 id='modalTitleDeleteAnnotatedSentence'>{% trans "Delete this annotated sente
 
                {% for media_okay,pk,path,file_type,type,alternative_gloss,file_name in other_media %}
                <tr>
-                   {% if "change_dataset" in dataset_perms %}
+                   {% if "change_permission" in dataset_perms %}
                      <td>
                         <span class='glyphicon glyphicon-trash other-video-delete' data-toggle='modal' data-target='#delete_other_media_{{pk}}'></span>
 
@@ -2536,7 +2536,7 @@ <h2 id='modalTitleMedia'>{% trans "Delete This Media" %}</h2>
 
            </table>
 
-           {% if "change_dataset" in dataset_perms %}
+           {% if "change_permission" in dataset_perms %}
             <form id='add_other_media' action='{% url "dictionary:add_othermedia" %}' method="POST" enctype="multipart/form-data">
 
                <input type='hidden' name='gloss' value='{{gloss.pk}}'>
diff --git a/signbank/dictionary/templates/dictionary/glosstags.html b/signbank/dictionary/templates/dictionary/glosstags.html
index 558308cd8..6e8e95cee 100755
--- a/signbank/dictionary/templates/dictionary/glosstags.html
+++ b/signbank/dictionary/templates/dictionary/glosstags.html
@@ -14,7 +14,7 @@
                    {% load underscore_to_space %}
                  <span class='tagname'>{{tag.name|underscore_to_space}}</span>
                 {% get_obj_perms request.user for gloss.dataset as "dataset_perms" %}
-                {% if "change_dataset" in dataset_perms %}
+                {% if "change_permission" in dataset_perms %}
                  <span class='tagcount'>
                      <a class='tagdelete editform'
                         id='{{tag.name}}' value={{tag.id}} name='{{tag.name}}'
@@ -28,7 +28,7 @@
           </ul>
       {% endif %}
     {% get_obj_perms request.user for gloss.dataset as "dataset_perms" %}
-    {% if "change_dataset" in dataset_perms %}
+    {% if "change_permission" in dataset_perms %}
       <div id="tagcontainer"></div>
       <div class='editform'>
           <form id='tagaddform' 
diff --git a/signbank/dictionary/templates/dictionary/morpheme_detail.html b/signbank/dictionary/templates/dictionary/morpheme_detail.html
index 80e12aba9..05e4669dd 100755
--- a/signbank/dictionary/templates/dictionary/morpheme_detail.html
+++ b/signbank/dictionary/templates/dictionary/morpheme_detail.html
@@ -294,7 +294,7 @@
     </ul>
     </div>
     {% get_obj_perms request.user for morpheme.lemma.dataset as "dataset_perms" %}
-    {% if "change_dataset" in dataset_perms %}
+    {% if "change_permission" in dataset_perms %}
     {% if perms.dictionary.change_morpheme %}
     <div class='pull-right' style="margin-right:15px;margin-top:10px;z-index:100;">
 
@@ -392,7 +392,7 @@ <h4>{% trans "Upload New Citation Form Image" %}</h4>
     </div>
     {% endif %}
 
-    {% if "change_dataset" in dataset_perms %}
+    {% if "change_permission" in dataset_perms %}
     {% if perms.dictionary.change_morpheme %}
     <div class="editform">
         <fieldset>
@@ -778,7 +778,7 @@ <h2 id='modalTitle'>{% trans "Delete This Note" %}</h2>
                {% for media_okay,pk,path,file_type,type,alternative_gloss,file_name in other_media %}
                <tr>
                    {% get_obj_perms request.user for morpheme.lemma.dataset as "dataset_perms" %}
-                   {% if "change_dataset" in dataset_perms %}
+                   {% if "change_permission" in dataset_perms %}
                      <td>
                         <span class='glyphicon glyphicon-trash other-video-delete' data-toggle='modal' data-target='#delete_other_media_{{pk}}'></span>
 
diff --git a/signbank/dictionary/templates/dictionary/morphemetags.html b/signbank/dictionary/templates/dictionary/morphemetags.html
index 15d173b9b..a2fb3a7e0 100644
--- a/signbank/dictionary/templates/dictionary/morphemetags.html
+++ b/signbank/dictionary/templates/dictionary/morphemetags.html
@@ -14,7 +14,7 @@
                    {% load underscore_to_space %}
                  <span class='tagname'>{{tag.name|underscore_to_space}}</span>
                  {% get_obj_perms request.user for morpheme.dataset as "dataset_perms" %}
-                 {% if "change_dataset" in dataset_perms %}
+                 {% if "change_permission" in dataset_perms %}
                  <span class='tagcount'>
                      <a class='tagdelete editform'
                         id='{{tag.name}}'
@@ -28,7 +28,7 @@
           </ul>
       {% endif %}
       {% get_obj_perms request.user for morpheme.dataset as "dataset_perms" %}
-      {% if "change_dataset" in dataset_perms %}
+      {% if "change_permission" in dataset_perms %}
       <div id="tagcontainer"></div>
       <div class='editform'>
           <form id='tagaddform' 
diff --git a/signbank/dictionary/tests.py b/signbank/dictionary/tests.py
index d6e63d139..37b360e4c 100644
--- a/signbank/dictionary/tests.py
+++ b/signbank/dictionary/tests.py
@@ -181,7 +181,7 @@ def test_createGloss(self):
         self.assertContains(response, "You are not authorized to change the selected dataset.")
 
         # Give the test user permission to change a dataset
-        assign_perm('change_dataset', self.user, test_dataset)
+        assign_perm('change_permission', self.user, test_dataset)
         response = client.post('/dictionary/update/gloss/', create_gloss_form_data)
 
         glosses = Gloss.objects.filter(lemma__dataset=test_dataset)
@@ -276,7 +276,7 @@ def testSearchForGlosses(self):
         # Search
         search_value_handedness = str(self.handedness_fieldchoice_1.machine_value)
 
-        assign_perm('can_view_dataset', self.user, test_dataset)
+        assign_perm('view_permission', self.user, test_dataset)
         response = client.get('/signs/search/',{'handedness[]': search_value_handedness})
         self.assertEqual(len(response.context['object_list']), 2)
 
@@ -294,8 +294,8 @@ def test_package_function(self):
 
         # Give the test user permission to change a dataset
         test_dataset = Dataset.objects.get(name=dataset_name)
-        assign_perm('can_view_dataset', self.user, test_dataset)
-        assign_perm('change_dataset', self.user, test_dataset)
+        assign_perm('view_permission', self.user, test_dataset)
+        assign_perm('change_permission', self.user, test_dataset)
         assign_perm('dictionary.search_gloss', self.user)
         assign_perm('dictionary.add_gloss', self.user)
         assign_perm('dictionary.change_gloss', self.user)
@@ -378,8 +378,8 @@ def testSearchForGlosses(self):
 
         # Give the test user permission to change a dataset
         test_dataset = Dataset.objects.get(name=dataset_name)
-        assign_perm('can_view_dataset', self.user, test_dataset)
-        assign_perm('change_dataset', self.user, test_dataset)
+        assign_perm('view_permission', self.user, test_dataset)
+        assign_perm('change_permission', self.user, test_dataset)
         assign_perm('dictionary.search_gloss', self.user)
         self.user.save()
 
@@ -501,7 +501,7 @@ def test_DatasetListView_ECV_export_empty_dataset(self):
         print('Test DatasetListView export_ecv with empty dataset')
 
         # Give the test user permission to change a dataset
-        assign_perm('change_dataset', self.user, self.test_dataset)
+        assign_perm('change_permission', self.user, self.test_dataset)
         print('User has permmission to change dataset.')
 
         client = Client(enforce_csrf_checks=False, json_encoder=DjangoJSONEncoder)
@@ -515,7 +515,7 @@ def test_DatasetListView_ECV_export_empty_dataset(self):
 
     def test_DatasetListView_ECV_export_permission_change_dataset(self):
 
-        print('Test DatasetListView export_ecv with permission change_dataset')
+        print('Test DatasetListView export_ecv with permission change_permission')
         print('Test Dataset is: ', self.test_dataset.acronym)
 
         location_ecv_files = ECV_FOLDER
@@ -525,7 +525,7 @@ def test_DatasetListView_ECV_export_permission_change_dataset(self):
             return
 
         # Give the test user permission to change a dataset
-        assign_perm('change_dataset', self.user, self.test_dataset)
+        assign_perm('change_permission', self.user, self.test_dataset)
         print('User has permmission to change dataset.')
 
         client = Client(enforce_csrf_checks=False, json_encoder=DjangoJSONEncoder)
@@ -607,7 +607,7 @@ def test_Export_csv(self):
         print('Test Dataset is: ', self.test_dataset.acronym)
 
         # Give the test user permission to change a dataset
-        assign_perm('change_dataset', self.user, self.test_dataset)
+        assign_perm('change_permission', self.user, self.test_dataset)
         print('User has permmission to change dataset.')
 
         assign_perm('dictionary.export_csv', self.user)
@@ -633,7 +633,7 @@ def test_Import_csv_update_gloss_for_lemma(self):
         print('Test Dataset is: ', self.test_dataset.acronym)
 
         # Give the test user permission to change a dataset
-        assign_perm('change_dataset', self.user, self.test_dataset)
+        assign_perm('change_permission', self.user, self.test_dataset)
         print('User has permmission to change dataset.')
 
         # Create test lemma idgloss
@@ -741,7 +741,7 @@ def test_Import_csv_new_gloss_for_lemma(self):
         print('Test Dataset is: ', self.test_dataset.acronym)
 
         # Give the test user permission to change a dataset
-        assign_perm('change_dataset', self.user, self.test_dataset)
+        assign_perm('change_permission', self.user, self.test_dataset)
         print('User has permmission to change dataset.')
 
         gloss_id = 1
@@ -832,7 +832,7 @@ def test_create_and_delete_video(self):
         test_dataset = Dataset.objects.get(name=dataset_name)
         default_language = Language.objects.get(id=settings.DEFAULT_DATASET_LANGUAGE_ID)
 
-        assign_perm('change_dataset', self.user, test_dataset)
+        assign_perm('change_permission', self.user, test_dataset)
         print('User granted permmission to change dataset.')
 
         # Create a lemma
@@ -928,7 +928,7 @@ def test_create_and_delete_utf8_video(self):
         test_dataset = Dataset.objects.get(name=dataset_name)
         default_language = Language.objects.get(id=settings.DEFAULT_DATASET_LANGUAGE_ID)
 
-        assign_perm('change_dataset', self.user, test_dataset)
+        assign_perm('change_permission', self.user, test_dataset)
         print('User granted permmission to change dataset.')
 
         # Create a lemma
@@ -1140,7 +1140,7 @@ def test_DetailViewRenders(self):
                             .format(self.hidden_gloss.pk))
 
         #With permissions you also see something
-        assign_perm('can_view_dataset', self.user, self.test_dataset)
+        assign_perm('view_permission', self.user, self.test_dataset)
         response = self.client.get('/dictionary/gloss/'+str(self.hidden_gloss.pk))
         self.assertNotEqual(len(response.content),0)
 
@@ -1150,7 +1150,7 @@ def test_JavaScriptIsValid(self):
         self.client = Client()
         self.client.login(username='test-user', password='test-user')
 
-        assign_perm('can_view_dataset', self.user, self.test_dataset)
+        assign_perm('view_permission', self.user, self.test_dataset)
         response = self.client.get('/dictionary/gloss/'+str(self.hidden_gloss.pk))
 
         invalid_patterns = ['= ;','= var']
@@ -1261,7 +1261,7 @@ def test_User_is_not_dataset_manager(self):
         logged_in = self.client.login(username=self.user.username, password=self.user_password)
         self.assertTrue(logged_in)
 
-        assign_perm('dictionary.change_dataset', self.user, self.test_dataset)
+        assign_perm('dictionary.change_permission', self.user, self.test_dataset)
 
         # Grant view permission
         form_data = {'dataset_acronym': self.test_dataset.acronym, 'username': self.user2.username, 'add_view_perm': 'Grant'}
@@ -1339,7 +1339,7 @@ def test_User_is_dataset_manager(self):
         # Make the user member of the group dataset managers
         dataset_manager_group = Group.objects.get(name='Dataset_Manager')
         dataset_manager_group.user_set.add(self.user)
-        assign_perm('dictionary.change_dataset', self.user, self.test_dataset)
+        assign_perm('dictionary.change_permission', self.user, self.test_dataset)
 
         # Grant view permission
         form_data ={'dataset_acronym': self.test_dataset.acronym, 'username': self.user2.username, 'add_view_perm': 'Grant'}
@@ -1396,7 +1396,7 @@ def test_Set_default_language(self):
         # Make the user member of the group dataset managers
         dataset_manager_group = Group.objects.get(name='Dataset_Manager')
         dataset_manager_group.user_set.add(self.user)
-        assign_perm('dictionary.change_dataset', self.user, self.test_dataset)
+        assign_perm('dictionary.change_permission', self.user, self.test_dataset)
         response = self.client.get(reverse('admin_dataset_manager'), form_data, follow=True)
         self.assertContains(response, 'The default language of')
 
@@ -1486,7 +1486,7 @@ def test_QueryLemmasWithoutGlosses(self):
 
         # Give the test user permission to change a dataset
         test_dataset = Dataset.objects.get(name=dataset_name)
-        assign_perm('can_view_dataset', self.user, test_dataset)
+        assign_perm('view_permission', self.user, test_dataset)
         self.user.save()
 
         # search for the lemma without glosses: test_lemma_without_gloss
@@ -1514,7 +1514,7 @@ def test_QueryLemmasWithoutGlosses(self):
         response = client.post('/dictionary/lemma/', {'delete_lemmas': 'delete_lemmas'}, follow=True)
         self.assertContains(response, 'You do not have change permission on the dataset of the lemma you are attempting to delete.')
 
-        assign_perm('change_dataset', self.user, test_dataset)
+        assign_perm('change_permission', self.user, test_dataset)
         self.user.save()
 
         response = client.post('/dictionary/lemma/?lemma_en=without', {'delete_lemmas': 'delete_lemmas'}, follow=True)
@@ -1612,8 +1612,8 @@ def test_create_handshape(self):
         # set the test dataset
         dataset_name = settings.DEFAULT_DATASET
         test_dataset = Dataset.objects.get(name=dataset_name)
-        assign_perm('can_view_dataset', self.user, test_dataset)
-        assign_perm('change_dataset', self.user, test_dataset)
+        assign_perm('view_permission', self.user, test_dataset)
+        assign_perm('change_permission', self.user, test_dataset)
 
         self.client.login(username='test-user', password='test-user')
 
@@ -1636,8 +1636,8 @@ def test_handshape_choices(self):
         # set the test dataset
         dataset_name = settings.DEFAULT_DATASET
         test_dataset = Dataset.objects.get(name=dataset_name)
-        assign_perm('can_view_dataset', self.user, test_dataset)
-        assign_perm('change_dataset', self.user, test_dataset)
+        assign_perm('view_permission', self.user, test_dataset)
+        assign_perm('change_permission', self.user, test_dataset)
 
         # Create 10 lemmas for use in testing
         language = Language.objects.get(id=get_default_language_id())
@@ -1804,7 +1804,7 @@ def test_SemanticField(self):
         #Create a client and log in
         client = Client(enforce_csrf_checks=False)
         client.login(username='test-user', password='test-user')
-        assign_perm('can_view_dataset', self.user, test_dataset)
+        assign_perm('view_permission', self.user, test_dataset)
 
         # Create a lemma
         new_lemma = LemmaIdgloss(dataset=test_dataset)
@@ -2546,7 +2546,7 @@ def test_analysis_frequency(self):
 
         self.client.login(username='test-user', password='test-user')
 
-        assign_perm('can_view_dataset', self.user, test_dataset)
+        assign_perm('view_permission', self.user, test_dataset)
 
         response = self.client.get('/analysis/frequencies/', follow=True)
         self.assertEqual(response.status_code,200)
@@ -3424,7 +3424,7 @@ def test_analysis_minimalpairs(self):
 
         self.client.login(username='test-user', password='test-user')
 
-        assign_perm('can_view_dataset', self.user, test_dataset)
+        assign_perm('view_permission', self.user, test_dataset)
         response = self.client.get('/analysis/minimalpairs/', {'paginate_by':20}, follow=True)
 
         objects_on_page = response.__dict__['context_data']['objects_on_page']
@@ -3539,7 +3539,7 @@ def test_emptyvalues_minimalpairs(self):
 
         self.client.login(username='test-user', password='test-user')
 
-        assign_perm('can_view_dataset', self.user, test_dataset)
+        assign_perm('view_permission', self.user, test_dataset)
         response = self.client.get('/analysis/minimalpairs/', {'paginate_by':20}, follow=True)
 
         objects_on_page = response.__dict__['context_data']['objects_on_page']
@@ -3736,10 +3736,10 @@ def test_crud_Senses(self):
         # Get the test dataset
         dataset_name = settings.DEFAULT_DATASET
         test_dataset = Dataset.objects.get(name=dataset_name)
-        assign_perm('change_dataset', self.user, test_dataset)
+        assign_perm('change_permission', self.user, test_dataset)
         assign_perm('dictionary.add_gloss', self.user)
         assign_perm('dictionary.change_gloss', self.user)
-        assign_perm('can_view_dataset', self.user, test_dataset)
+        assign_perm('view_permission', self.user, test_dataset)
         assign_perm('dictionary.search_gloss', self.user)
         self.user.save()
 
@@ -3905,12 +3905,12 @@ def test_Similar_Senses(self):
         # Get the test dataset
         dataset_name = settings.DEFAULT_DATASET
         test_dataset = Dataset.objects.get(name=dataset_name)
-        assign_perm('change_dataset', self.user, test_dataset)
+        assign_perm('change_permission', self.user, test_dataset)
         assign_perm('dictionary.add_gloss', self.user)
         assign_perm('dictionary.change_gloss', self.user)
         assign_perm('dictionary.add_sense', self.user)
 
-        assign_perm('can_view_dataset', self.user, test_dataset)
+        assign_perm('view_permission', self.user, test_dataset)
         assign_perm('dictionary.search_gloss', self.user)
         self.user.save()
 
@@ -4008,12 +4008,12 @@ def test_no_empty_translations_Senses(self):
         # Get the test dataset
         dataset_name = settings.DEFAULT_DATASET
         test_dataset = Dataset.objects.get(name=dataset_name)
-        assign_perm('change_dataset', self.user, test_dataset)
+        assign_perm('change_permission', self.user, test_dataset)
         assign_perm('dictionary.add_gloss', self.user)
         assign_perm('dictionary.change_gloss', self.user)
         assign_perm('dictionary.add_sense', self.user)
 
-        assign_perm('can_view_dataset', self.user, test_dataset)
+        assign_perm('view_permission', self.user, test_dataset)
         assign_perm('dictionary.search_gloss', self.user)
         self.user.save()
 
diff --git a/signbank/dictionary/update.py b/signbank/dictionary/update.py
index 4cb49a482..a713c516c 100755
--- a/signbank/dictionary/update.py
+++ b/signbank/dictionary/update.py
@@ -97,9 +97,9 @@ def add_gloss(request):
         except (ObjectDoesNotExist, IntegerField, ValueError, TypeError):
             return show_error(request, _("The given Lemma Idgloss ID is unknown."), form, dataset_languages)
 
-    # Check for 'change_dataset' permission
-    if dataset and ('change_dataset' not in get_user_perms(request.user, dataset)) \
-            and ('change_dataset' not in get_group_perms(request.user, dataset))\
+    # Check for 'change_permission' permission
+    if dataset and ('change_permission' not in get_user_perms(request.user, dataset)) \
+            and ('change_permission' not in get_group_perms(request.user, dataset))\
             and not request.user.is_staff:
         return show_error(request, _("You are not authorized to change the selected dataset."), form, dataset_languages)
 
@@ -839,7 +839,7 @@ def update_gloss(request, glossid):
 
             return HttpResponse(str(newvalue), {'content-type': 'text/plain'})
 
-        if ds in guardian.shortcuts.get_objects_for_user(request.user, ['view_dataset', 'can_view_dataset'],
+        if ds in guardian.shortcuts.get_objects_for_user(request.user, ['view_permission'],
                                                          Dataset, any_perm=True):
             newvalue = value
             setattr(gloss, field, ds)
@@ -2319,9 +2319,9 @@ def add_morpheme(request):
                                  _("The given Lemma Idgloss ID is unknown."))
             return render(request, 'dictionary/add_morpheme.html', {'add_morpheme_form': form})
 
-    # Check for 'change_dataset' permission
-    if dataset and ('change_dataset' not in get_user_perms(request.user, dataset)) \
-            and ('change_dataset' not in get_group_perms(request.user, dataset))\
+    # Check for 'change_permission' permission
+    if dataset and ('change_permission' not in get_user_perms(request.user, dataset)) \
+            and ('change_permission' not in get_group_perms(request.user, dataset))\
             and not request.user.is_staff:
         messages.add_message(request, messages.ERROR, _("You are not authorized to change the selected dataset."))
         return render(request, 'dictionary/add_morpheme.html', {'add_morpheme_form': form})
@@ -2489,7 +2489,7 @@ def update_morpheme(request, morphemeid):
 
             return HttpResponse(str(newvalue), {'content-type': 'text/plain'})
 
-        if ds in guardian.shortcuts.get_objects_for_user(request.user, ['view_dataset', 'can_view_dataset'],
+        if ds in guardian.shortcuts.get_objects_for_user(request.user, ['view_permission'],
                                                          Dataset, any_perm=True):
             newvalue = value
             setattr(morpheme, field, ds)
@@ -2925,7 +2925,7 @@ def update_dataset(request, datasetid):
                                  _('You must be in group Dataset Manager to modify dataset details.'))
             return HttpResponseForbidden("Dataset Update Not Allowed")
 
-        user_change_datasets = guardian.shortcuts.get_objects_for_user(request.user, 'change_dataset', Dataset, accept_global_perms=False)
+        user_change_datasets = guardian.shortcuts.get_objects_for_user(request.user, 'change_permission', Dataset, accept_global_perms=False)
         if dataset not in user_change_datasets:
             return HttpResponseForbidden("Dataset Update Not Allowed")
 
@@ -3043,7 +3043,7 @@ def update_excluded_choices(request):
     selected_datasets = get_selected_datasets_for_user(request.user)
 
     managed_datasets = []
-    change_dataset_permission = get_objects_for_user(request.user, 'change_dataset', Dataset)
+    change_dataset_permission = get_objects_for_user(request.user, 'change_permission', Dataset)
     for dataset in selected_datasets:
         if dataset in change_dataset_permission:
             managed_datasets.append(dataset)
@@ -3192,8 +3192,8 @@ def remove_eaf_files(request):
         messages.add_message(request, messages.ERROR, _('Dataset does not exist.'))
         return HttpResponseRedirect(reverse('admin_dataset_view'))
 
-    # Check for 'change_dataset' permission
-    user_change_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset, accept_global_perms=False)
+    # Check for 'change_permission' permission
+    user_change_datasets = get_objects_for_user(request.user, 'change_permission', Dataset, accept_global_perms=False)
     if not user_change_datasets.exists() or dataset not in user_change_datasets:
         messages.add_message(request, messages.ERROR, _("You are not authorized to remove eaf files."))
         return HttpResponseRedirect(request.META.get('HTTP_REFERER'))
@@ -3243,8 +3243,8 @@ def upload_eaf_files(request):
             messages.add_message(request, messages.ERROR, _('Dataset does not exist.'))
             return HttpResponseRedirect(reverse('admin_dataset_manager'))
 
-        # Check for 'change_dataset' permission
-        user_change_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset, accept_global_perms=False)
+        # Check for 'change_permission' permission
+        user_change_datasets = get_objects_for_user(request.user, 'change_permission', Dataset, accept_global_perms=False)
         if not user_change_datasets.exists() or dataset not in user_change_datasets:
             messages.add_message(request, messages.ERROR, _("You are not authorized to upload eaf files."))
             return HttpResponseRedirect(request.META.get('HTTP_REFERER'))
@@ -3499,7 +3499,7 @@ def assign_lemma_dataset_to_gloss(request, glossid):
 
     if not request.user.is_superuser:
         # check that user can write to the dataset
-        datasets_user_can_change = get_objects_for_user(request.user, 'change_dataset', Dataset)
+        datasets_user_can_change = get_objects_for_user(request.user, 'change_permission', Dataset)
         if dataset_of_dummy not in datasets_user_can_change:
             failure_message = _('You do not have change permission for') + ' ' + dummy_lemma.dataset.name
             return HttpResponse(json.dumps({'glossid': str(glossid),
@@ -3524,7 +3524,7 @@ def okay_to_update_gloss(request, gloss):
     if not gloss or not gloss.lemma:
         return False
 
-    if gloss.lemma.dataset not in guardian.shortcuts.get_objects_for_user(request.user, ['change_dataset'],
+    if gloss.lemma.dataset not in guardian.shortcuts.get_objects_for_user(request.user, ['change_permission'],
                                                                           Dataset, any_perm=True):
         return False
     
diff --git a/signbank/dictionary/views.py b/signbank/dictionary/views.py
index 3127fe5c6..ab733f986 100644
--- a/signbank/dictionary/views.py
+++ b/signbank/dictionary/views.py
@@ -544,7 +544,7 @@ def add_new_morpheme(request):
 def import_csv_create(request):
     user = request.user
     import guardian
-    user_datasets = guardian.shortcuts.get_objects_for_user(user, 'change_dataset', Dataset)
+    user_datasets = guardian.shortcuts.get_objects_for_user(user, 'change_permission', Dataset)
     user_datasets_names = [dataset.acronym for dataset in user_datasets]
 
     selected_datasets = get_selected_datasets_for_user(user)
@@ -951,7 +951,7 @@ def import_csv_create(request):
 def import_csv_update(request):
     user = request.user
     import guardian
-    user_datasets = guardian.shortcuts.get_objects_for_user(user, 'change_dataset', Dataset)
+    user_datasets = guardian.shortcuts.get_objects_for_user(user, 'change_permission', Dataset)
     user_datasets_names = [dataset.acronym for dataset in user_datasets]
 
     selected_datasets = get_selected_datasets_for_user(user)
@@ -1508,7 +1508,7 @@ def import_csv_update(request):
 def import_csv_lemmas(request):
     user = request.user
     import guardian
-    user_datasets = guardian.shortcuts.get_objects_for_user(user, 'change_dataset', Dataset)
+    user_datasets = guardian.shortcuts.get_objects_for_user(user, 'change_permission', Dataset)
     user_datasets_names = [dataset.acronym for dataset in user_datasets]
 
     selected_datasets = get_selected_datasets_for_user(user)
@@ -2296,7 +2296,7 @@ def package(request):
 @put_api_user_in_request
 def info(request):
     import guardian
-    user_datasets = guardian.shortcuts.get_objects_for_user(request.user, 'change_dataset', Dataset)
+    user_datasets = guardian.shortcuts.get_objects_for_user(request.user, 'change_permission', Dataset)
     user_datasets_names = [dataset.acronym for dataset in user_datasets]
 
     # Put the default dataset in first position
@@ -2803,7 +2803,7 @@ def gloss_api_get_sign_name_and_media_info(request):
 def import_csv_create_sentences(request):
     user = request.user
     import guardian
-    user_datasets = guardian.shortcuts.get_objects_for_user(user, 'change_dataset', Dataset)
+    user_datasets = guardian.shortcuts.get_objects_for_user(user, 'change_permission', Dataset)
     user_datasets_names = [dataset.acronym for dataset in user_datasets]
 
     selected_datasets = get_selected_datasets_for_user(user)
diff --git a/signbank/gloss_morphology_update.py b/signbank/gloss_morphology_update.py
index 4bc1a64f3..e24af7fc2 100644
--- a/signbank/gloss_morphology_update.py
+++ b/signbank/gloss_morphology_update.py
@@ -172,7 +172,7 @@ def api_update_gloss_morphology(request, datasetid, glossid):
         results['updatestatus'] = "Failed"
         return JsonResponse(results)
 
-    change_permit_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset)
+    change_permit_datasets = get_objects_for_user(request.user, 'change_permission', Dataset)
     if dataset not in change_permit_datasets:
         errors[gettext("Dataset")] = gettext("No change permission for dataset.")
         results['errors'] = errors
diff --git a/signbank/gloss_update.py b/signbank/gloss_update.py
index 23df03adc..a7f3bcebe 100644
--- a/signbank/gloss_update.py
+++ b/signbank/gloss_update.py
@@ -553,7 +553,7 @@ def api_update_gloss(request, datasetid, glossid):
         results['updatestatus'] = "Failed"
         return JsonResponse(results)
 
-    change_permit_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset)
+    change_permit_datasets = get_objects_for_user(request.user, 'change_permission', Dataset)
     if dataset not in change_permit_datasets:
         errors[gettext("Dataset")] = gettext("No change permission for dataset.")
         results['errors'] = errors
@@ -689,7 +689,7 @@ def api_delete_gloss(request, datasetid, glossid):
         results['updatestatus'] = "Failed"
         return JsonResponse(results)
 
-    change_permit_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset)
+    change_permit_datasets = get_objects_for_user(request.user, 'change_permission', Dataset)
     if dataset not in change_permit_datasets:
         errors[gettext("Dataset")] = gettext("No change permission for dataset.")
         results['errors'] = errors
@@ -769,7 +769,7 @@ def api_restore_gloss(request, datasetid, glossid):
         results['updatestatus'] = "Failed"
         return JsonResponse(results)
 
-    change_permit_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset)
+    change_permit_datasets = get_objects_for_user(request.user, 'change_permission', Dataset)
     if dataset not in change_permit_datasets:
         errors[gettext("Dataset")] = gettext("No change permission for dataset.")
         results['errors'] = errors
@@ -943,7 +943,7 @@ def api_update_gloss_nmevideo(request, datasetid, glossid, videoid):
         results['updatestatus'] = "Failed"
         return JsonResponse(results)
 
-    change_permit_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset)
+    change_permit_datasets = get_objects_for_user(request.user, 'change_permission', Dataset)
     if dataset not in change_permit_datasets:
         errors[gettext("Dataset")] = gettext("No change permission for dataset.")
         results['errors'] = errors
@@ -1086,7 +1086,7 @@ def api_create_gloss_nmevideo(request, datasetid, glossid):
         results['updatestatus'] = "Failed"
         return JsonResponse(results)
 
-    change_permit_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset)
+    change_permit_datasets = get_objects_for_user(request.user, 'change_permission', Dataset)
     if dataset not in change_permit_datasets:
         errors[gettext("Dataset")] = gettext("No change permission for dataset.")
         results['errors'] = errors
@@ -1170,7 +1170,7 @@ def api_delete_gloss_nmevideo(request, datasetid, glossid, videoid):
         results['updatestatus'] = "Failed"
         return JsonResponse(results)
 
-    change_permit_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset)
+    change_permit_datasets = get_objects_for_user(request.user, 'change_permission', Dataset)
     if dataset not in change_permit_datasets:
         errors[gettext("Dataset")] = gettext("No change permission for dataset.")
         results['errors'] = errors
diff --git a/signbank/manage_videos.py b/signbank/manage_videos.py
index 41e8591f4..21b0abef2 100644
--- a/signbank/manage_videos.py
+++ b/signbank/manage_videos.py
@@ -72,7 +72,7 @@ def upload_zipped_videos_folder(request):
 
     # make sure the user can write to this dataset
     from guardian.shortcuts import get_objects_for_user
-    user_change_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset,
+    user_change_datasets = get_objects_for_user(request.user, 'change_permission', Dataset,
                                                 accept_global_perms=False)
     if not user_change_datasets or dataset not in user_change_datasets:
         messages.add_message(request, messages.ERROR, _('No change dataset permission.'))
@@ -258,7 +258,7 @@ def import_video_to_gloss_json(request):
 
     # make sure the user can write to this dataset
     from guardian.shortcuts import get_objects_for_user
-    user_change_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset,
+    user_change_datasets = get_objects_for_user(request.user, 'change_permission', Dataset,
                                                 accept_global_perms=False)
     if not user_change_datasets or dataset not in user_change_datasets:
         return JsonResponse({})
diff --git a/signbank/registration/views.py b/signbank/registration/views.py
index 4cd9542de..e4d62496c 100755
--- a/signbank/registration/views.py
+++ b/signbank/registration/views.py
@@ -137,7 +137,7 @@ class as the ``form_class`` keyword argument. The form class you
                     if dataset_obj.is_public:
 
                         # Give user access to view the database
-                        assign_perm('can_view_dataset', new_user, dataset_obj)
+                        assign_perm('view_permission', new_user, dataset_obj)
 
                         for owner in owners_of_dataset:
 
@@ -314,7 +314,7 @@ def users_without_dataset(request):
                 continue
 
             user = User.objects.get(pk=int(user.split('_')[-1]))
-            assign_perm('can_view_dataset', user, main_dataset)
+            assign_perm('view_permission', user, main_dataset)
 
             users_with_access.append(user.first_name + ' ' + user.last_name)
 
@@ -345,11 +345,11 @@ def user_profile(request):
     view_permit_datasets = []
     for dataset in Dataset.objects.all():
         permissions_for_dataset = get_user_perms(request.user, dataset)
-        if 'view_dataset' in permissions_for_dataset or 'can_view_dataset' in permissions_for_dataset:
+        if 'view_permission' in permissions_for_dataset:
             view_permit_datasets.append(dataset)
     change_permit_datasets = []
     for dataset_user_can_view in view_permit_datasets:
-        if 'change_dataset' in get_user_perms(request.user, dataset_user_can_view):
+        if 'change_permission' in get_user_perms(request.user, dataset_user_can_view):
             change_permit_datasets.append(dataset_user_can_view)
     user_has_queries = SearchHistory.objects.filter(user=request.user).count()
     user_can_change_glosses = len(change_permit_datasets) > 0
diff --git a/signbank/tools.py b/signbank/tools.py
index 0e77b0813..26b3a5dc3 100755
--- a/signbank/tools.py
+++ b/signbank/tools.py
@@ -1722,7 +1722,7 @@ def get_users_without_dataset():
     users_with_no_dataset = []
 
     for user in User.objects.all():
-        if user.is_active and len(get_objects_for_user(user, ['view_dataset', 'can_view_dataset'], Dataset, any_perm=True)) == 0:
+        if user.is_active and len(get_objects_for_user(user, ['view_permission'], Dataset, any_perm=True)) == 0:
             users_with_no_dataset.append(user)
 
     return users_with_no_dataset

From 42321cce02108004c074c5e5541a714bc5fa886b Mon Sep 17 00:00:00 2001
From: susanodd <mijnoog@kpnmail.nl>
Date: Thu, 22 Aug 2024 18:26:57 +0200
Subject: [PATCH 02/11] #1270: Fixed obsolete tests since messages turned off.

Put permissions on database back to what they were.
---
 signbank/dictionary/adminviews.py | 38 ++++++-------
 signbank/dictionary/tests.py      | 95 +++++++++++++++----------------
 signbank/registration/views.py    |  4 +-
 3 files changed, 66 insertions(+), 71 deletions(-)

diff --git a/signbank/dictionary/adminviews.py b/signbank/dictionary/adminviews.py
index 0b0d74744..561670b16 100755
--- a/signbank/dictionary/adminviews.py
+++ b/signbank/dictionary/adminviews.py
@@ -851,7 +851,7 @@ def get(self, request, *args, **kwargs):
                 return HttpResponseRedirect(reverse('registration:login'))
 
         dataset_of_requested_gloss = self.object.lemma.dataset
-        datasets_user_can_view = get_objects_for_user(request.user, ['view_permission'],
+        datasets_user_can_view = get_objects_for_user(request.user, ['dictionary.view_dataset'],
                                                       Dataset, accept_global_perms=True, any_perm=True)
 
         if dataset_of_requested_gloss not in selected_datasets:
@@ -1292,7 +1292,7 @@ def get_context_data(self, **kwargs):
             context['dataset_choices'] = {}
             user = self.request.user
             if user.is_authenticated:
-                qs = get_objects_for_user(user, ['view_permission'], Dataset, accept_global_perms=True, any_perm=True)
+                qs = get_objects_for_user(user, ['dictionary.view_dataset'], Dataset, accept_global_perms=True, any_perm=True)
                 dataset_choices = {}
                 for dataset in qs:
                     dataset_choices[dataset.acronym] = dataset.acronym
@@ -1477,7 +1477,7 @@ def get(self, request, *args, **kwargs):
                 return HttpResponseRedirect(reverse('registration:login'))
 
         dataset_of_requested_gloss = self.object.lemma.dataset
-        datasets_user_can_view = get_objects_for_user(request.user, ['view_permission'],
+        datasets_user_can_view = get_objects_for_user(request.user, ['dictionary.view_dataset'],
                                                       Dataset, accept_global_perms=True, any_perm=True)
 
         if dataset_of_requested_gloss not in selected_datasets:
@@ -1586,7 +1586,7 @@ def get(self, request, *args, **kwargs):
                 return HttpResponseRedirect(reverse('registration:login'))
 
         dataset_of_requested_gloss = self.object.lemma.dataset
-        datasets_user_can_view = get_objects_for_user(request.user, ['view_permission'],
+        datasets_user_can_view = get_objects_for_user(request.user, ['dictionary.view_dataset'],
                                                       Dataset, accept_global_perms=True, any_perm=True)
 
         if dataset_of_requested_gloss not in selected_datasets:
@@ -2876,7 +2876,7 @@ def get_queryset(self):
             checker.prefetch_perms(qs)
 
             for dataset in qs:
-                checker.has_perm('view_permission', dataset)
+                checker.has_perm('dictionary.view_dataset', dataset)
 
             return qs
         else:
@@ -2916,7 +2916,7 @@ def get(self, request, *args, **kwargs):
                 return HttpResponseRedirect(reverse('registration:login'))
 
         dataset_of_requested_gloss = self.object.lemma.dataset
-        datasets_user_can_view = get_objects_for_user(request.user, ['view_permission'],
+        datasets_user_can_view = get_objects_for_user(request.user, ['dictionary.view_dataset'],
                                                       Dataset, accept_global_perms=True, any_perm=True)
 
         if dataset_of_requested_gloss not in selected_datasets:
@@ -2982,7 +2982,7 @@ def get_context_data(self, **kwargs):
             context['dataset_choices'] = {}
             user = self.request.user
             if user.is_authenticated:
-                qs = get_objects_for_user(user, ['view_permission'],
+                qs = get_objects_for_user(user, ['dictionary.view_dataset'],
                                           Dataset, accept_global_perms=True, any_perm=True)
                 dataset_choices = {}
                 for dataset in qs:
@@ -3128,7 +3128,7 @@ def get_context_data(self, **kwargs):
             context['dataset_choices'] = {}
             user = self.request.user
             if user.is_authenticated:
-                qs = get_objects_for_user(user, ['view_permission'],
+                qs = get_objects_for_user(user, ['dictionary.view_dataset'],
                                           Dataset, accept_global_perms=True, any_perm=True)
                 dataset_choices = {}
                 for dataset in qs:
@@ -3553,14 +3553,14 @@ def render_to_request_response(self, context):
 
         # make sure the user can write to this dataset
         from guardian.shortcuts import get_objects_for_user, assign_perm
-        user_view_datasets = get_objects_for_user(self.request.user, ['view_permission'],
+        user_view_datasets = get_objects_for_user(self.request.user, ['dictionary.view_dataset'],
                                                   Dataset, accept_global_perms=True, any_perm=True)
         may_request_dataset = True
         if dataset_object.is_public and not dataset_object in user_view_datasets:
             # the user currently has no view permission for the requested dataset
             # Give permission to access dataset
             may_request_dataset = True
-            assign_perm('view_permission', self.request.user, dataset_object)
+            assign_perm('dictionary.view_dataset', self.request.user, dataset_object)
             messages.add_message(self.request, messages.INFO,
                                              _('View permission for user successfully granted.'))
         elif not dataset_object.is_public and not dataset_object in user_view_datasets:
@@ -3716,7 +3716,7 @@ def get_queryset(self):
             checker.prefetch_perms(qs)
 
             for dataset in qs:
-                checker.has_perm('view_permission', dataset)
+                checker.has_perm('dictionary.view_dataset', dataset)
             qs = qs.annotate(Count('lemmaidgloss__gloss')).order_by('acronym')
 
             return qs
@@ -3912,7 +3912,7 @@ def render_to_add_user_response(self, context):
 
         from guardian.shortcuts import assign_perm, remove_perm
         datasets_user_can_change = get_objects_for_user(user_object, 'change_permission', Dataset, accept_global_perms=False)
-        datasets_user_can_view = get_objects_for_user(user_object, ['view_permission'],
+        datasets_user_can_view = get_objects_for_user(user_object, ['dictionary.view_dataset'],
                                                       Dataset, accept_global_perms=False, any_perm=True)
         groups_user_is_in = Group.objects.filter(user=user_object)
 
@@ -3928,7 +3928,7 @@ def render_to_add_user_response(self, context):
                 return HttpResponseRedirect(reverse('admin_dataset_manager')+'?'+manage_identifier)
 
             try:
-                assign_perm('view_permission', user_object, dataset_object)
+                assign_perm('dictionary.view_dataset', user_object, dataset_object)
                 messages.add_message(self.request, messages.INFO,
                                  _('View permission for user successfully granted.'))
 
@@ -4015,8 +4015,8 @@ def render_to_add_user_response(self, context):
                     try:
                         # also need to remove change_dataset perm in this case
                         from guardian.shortcuts import remove_perm
-                        remove_perm('view_permission', user_object, dataset_object)
-                        remove_perm('change_permission', user_object, dataset_object)
+                        remove_perm('dictionary.view_dataset', user_object, dataset_object)
+                        remove_perm('change_dataset', user_object, dataset_object)
                         messages.add_message(self.request, messages.INFO,
                                              _('View (and change) permission for user successfully revoked.'))
                     except (PermissionError, SystemError, OSError):
@@ -4614,7 +4614,7 @@ def get(self, request, *args, **kwargs):
             return HttpResponseRedirect(reverse('registration:login'))
 
         dataset = self.object
-        datasets_user_can_view = get_objects_for_user(request.user, ['view_permission'],
+        datasets_user_can_view = get_objects_for_user(request.user, ['dictionary.view_dataset'],
                                                       Dataset, accept_global_perms=True, any_perm=True)
 
         if dataset not in datasets_user_can_view:
@@ -4955,7 +4955,7 @@ def get(self, request, *args, **kwargs):
                 return HttpResponseRedirect(reverse('registration:login'))
 
         dataset_of_requested_morpheme = self.object.lemma.dataset
-        datasets_user_can_view = get_objects_for_user(request.user, ['view_permission'],
+        datasets_user_can_view = get_objects_for_user(request.user, ['dictionary.view_dataset'],
                                                       Dataset, accept_global_perms=False, any_perm=True)
 
         if dataset_of_requested_morpheme not in selected_datasets:
@@ -5200,7 +5200,7 @@ def get_context_data(self, **kwargs):
             context['dataset_choices'] = {}
             user = self.request.user
             if user.is_authenticated:
-                qs = get_objects_for_user(user, ['view_permission'],
+                qs = get_objects_for_user(user, ['dictionary.view_dataset'],
                                           Dataset, accept_global_perms=False, any_perm=True)
                 dataset_choices = dict()
                 for dataset in qs:
@@ -6354,7 +6354,7 @@ def get(self, request, *args, **kwargs):
             return HttpResponseRedirect(reverse('registration:login'))
 
         dataset_of_requested_lemma = self.object.dataset
-        datasets_user_can_view = get_objects_for_user(request.user, ['view_permission'],
+        datasets_user_can_view = get_objects_for_user(request.user, ['dictionary.view_dataset'],
                                                       Dataset, accept_global_perms=False, any_perm=True)
 
         if dataset_of_requested_lemma not in selected_datasets:
diff --git a/signbank/dictionary/tests.py b/signbank/dictionary/tests.py
index 37b360e4c..3e682254b 100644
--- a/signbank/dictionary/tests.py
+++ b/signbank/dictionary/tests.py
@@ -1,3 +1,4 @@
+import guardian.shortcuts
 from django.db.models import CharField, TextField
 #from django.forms import TextInput, Textarea, CharField
 from signbank.dictionary.adminviews import *
@@ -181,7 +182,7 @@ def test_createGloss(self):
         self.assertContains(response, "You are not authorized to change the selected dataset.")
 
         # Give the test user permission to change a dataset
-        assign_perm('change_permission', self.user, test_dataset)
+        assign_perm('dictionary.change_dataset', self.user, test_dataset)
         response = client.post('/dictionary/update/gloss/', create_gloss_form_data)
 
         glosses = Gloss.objects.filter(lemma__dataset=test_dataset)
@@ -276,7 +277,7 @@ def testSearchForGlosses(self):
         # Search
         search_value_handedness = str(self.handedness_fieldchoice_1.machine_value)
 
-        assign_perm('view_permission', self.user, test_dataset)
+        assign_perm('dictionary.view_dataset', self.user, test_dataset)
         response = client.get('/signs/search/',{'handedness[]': search_value_handedness})
         self.assertEqual(len(response.context['object_list']), 2)
 
@@ -294,8 +295,8 @@ def test_package_function(self):
 
         # Give the test user permission to change a dataset
         test_dataset = Dataset.objects.get(name=dataset_name)
-        assign_perm('view_permission', self.user, test_dataset)
-        assign_perm('change_permission', self.user, test_dataset)
+        assign_perm('dictionary.view_dataset', self.user, test_dataset)
+        assign_perm('dictionary.change_dataset', self.user, test_dataset)
         assign_perm('dictionary.search_gloss', self.user)
         assign_perm('dictionary.add_gloss', self.user)
         assign_perm('dictionary.change_gloss', self.user)
@@ -378,8 +379,8 @@ def testSearchForGlosses(self):
 
         # Give the test user permission to change a dataset
         test_dataset = Dataset.objects.get(name=dataset_name)
-        assign_perm('view_permission', self.user, test_dataset)
-        assign_perm('change_permission', self.user, test_dataset)
+        assign_perm('dictionary.view_dataset', self.user, test_dataset)
+        assign_perm('dictionary.change_dataset', self.user, test_dataset)
         assign_perm('dictionary.search_gloss', self.user)
         self.user.save()
 
@@ -501,7 +502,7 @@ def test_DatasetListView_ECV_export_empty_dataset(self):
         print('Test DatasetListView export_ecv with empty dataset')
 
         # Give the test user permission to change a dataset
-        assign_perm('change_permission', self.user, self.test_dataset)
+        assign_perm('dictionary.change_dataset', self.user, self.test_dataset)
         print('User has permmission to change dataset.')
 
         client = Client(enforce_csrf_checks=False, json_encoder=DjangoJSONEncoder)
@@ -525,7 +526,7 @@ def test_DatasetListView_ECV_export_permission_change_dataset(self):
             return
 
         # Give the test user permission to change a dataset
-        assign_perm('change_permission', self.user, self.test_dataset)
+        assign_perm('dictionary.change_dataset', self.user, self.test_dataset)
         print('User has permmission to change dataset.')
 
         client = Client(enforce_csrf_checks=False, json_encoder=DjangoJSONEncoder)
@@ -607,7 +608,7 @@ def test_Export_csv(self):
         print('Test Dataset is: ', self.test_dataset.acronym)
 
         # Give the test user permission to change a dataset
-        assign_perm('change_permission', self.user, self.test_dataset)
+        assign_perm('dictionary.change_dataset', self.user, self.test_dataset)
         print('User has permmission to change dataset.')
 
         assign_perm('dictionary.export_csv', self.user)
@@ -633,7 +634,7 @@ def test_Import_csv_update_gloss_for_lemma(self):
         print('Test Dataset is: ', self.test_dataset.acronym)
 
         # Give the test user permission to change a dataset
-        assign_perm('change_permission', self.user, self.test_dataset)
+        assign_perm('dictionary.change_dataset', self.user, self.test_dataset)
         print('User has permmission to change dataset.')
 
         # Create test lemma idgloss
@@ -741,7 +742,7 @@ def test_Import_csv_new_gloss_for_lemma(self):
         print('Test Dataset is: ', self.test_dataset.acronym)
 
         # Give the test user permission to change a dataset
-        assign_perm('change_permission', self.user, self.test_dataset)
+        assign_perm('dictionary.change_dataset', self.user, self.test_dataset)
         print('User has permmission to change dataset.')
 
         gloss_id = 1
@@ -832,7 +833,7 @@ def test_create_and_delete_video(self):
         test_dataset = Dataset.objects.get(name=dataset_name)
         default_language = Language.objects.get(id=settings.DEFAULT_DATASET_LANGUAGE_ID)
 
-        assign_perm('change_permission', self.user, test_dataset)
+        assign_perm('dictionary.change_dataset', self.user, test_dataset)
         print('User granted permmission to change dataset.')
 
         # Create a lemma
@@ -928,7 +929,7 @@ def test_create_and_delete_utf8_video(self):
         test_dataset = Dataset.objects.get(name=dataset_name)
         default_language = Language.objects.get(id=settings.DEFAULT_DATASET_LANGUAGE_ID)
 
-        assign_perm('change_permission', self.user, test_dataset)
+        assign_perm('dictionary.change_dataset', self.user, test_dataset)
         print('User granted permmission to change dataset.')
 
         # Create a lemma
@@ -1140,7 +1141,7 @@ def test_DetailViewRenders(self):
                             .format(self.hidden_gloss.pk))
 
         #With permissions you also see something
-        assign_perm('view_permission', self.user, self.test_dataset)
+        assign_perm('dictionary.view_dataset', self.user, self.test_dataset)
         response = self.client.get('/dictionary/gloss/'+str(self.hidden_gloss.pk))
         self.assertNotEqual(len(response.content),0)
 
@@ -1150,7 +1151,7 @@ def test_JavaScriptIsValid(self):
         self.client = Client()
         self.client.login(username='test-user', password='test-user')
 
-        assign_perm('view_permission', self.user, self.test_dataset)
+        assign_perm('dictionary.view_dataset', self.user, self.test_dataset)
         response = self.client.get('/dictionary/gloss/'+str(self.hidden_gloss.pk))
 
         invalid_patterns = ['= ;','= var']
@@ -1261,7 +1262,7 @@ def test_User_is_not_dataset_manager(self):
         logged_in = self.client.login(username=self.user.username, password=self.user_password)
         self.assertTrue(logged_in)
 
-        assign_perm('dictionary.change_permission', self.user, self.test_dataset)
+        assign_perm('dictionary.change_dataset', self.user, self.test_dataset)
 
         # Grant view permission
         form_data = {'dataset_acronym': self.test_dataset.acronym, 'username': self.user2.username, 'add_view_perm': 'Grant'}
@@ -1339,26 +1340,23 @@ def test_User_is_dataset_manager(self):
         # Make the user member of the group dataset managers
         dataset_manager_group = Group.objects.get(name='Dataset_Manager')
         dataset_manager_group.user_set.add(self.user)
-        assign_perm('dictionary.change_permission', self.user, self.test_dataset)
+        assign_perm('dictionary.change_dataset', self.user, self.test_dataset)
 
         # Grant view permission
         form_data ={'dataset_acronym': self.test_dataset.acronym, 'username': self.user2.username, 'add_view_perm': 'Grant'}
         response = self.client.get(reverse('admin_dataset_manager'), form_data, follow=True)
-        self.assertContains(response, 'View permission for user successfully granted.'
-                            .format(self.user2.username, self.user2.first_name, self.user2.last_name))
+        self.assertEqual(response.status_code, 200)
 
         # Revoke view permission
-        form_data ={'dataset_acronym': self.test_dataset.acronym, 'username': self.user2.username,
+        form_data = {'dataset_acronym': self.test_dataset.acronym, 'username': self.user2.username,
                     'delete_view_perm': 'Revoke'}
         response = self.client.get(reverse('admin_dataset_manager'), form_data, follow=True)
-        self.assertContains(response, 'View (and change) permission for user successfully revoked.'
-                            .format(self.user2.username))
+        self.assertEqual(response.status_code, 200)
 
         # Grant change permission without view permission
         form_data ={'dataset_acronym': self.test_dataset.acronym, 'username': self.user2.username, 'add_change_perm': 'Grant'}
         response = self.client.get(reverse('admin_dataset_manager'), form_data, follow=True)
-        self.assertContains(response, 'User does not have view permission for this dataset. Please grant view permission first.'
-                            .format(self.user2.username, self.user2.first_name, self.user2.last_name))
+        self.assertEqual(response.status_code, 200)
 
         # Grant change permission with view permission
         # Grant view permission first
@@ -1367,21 +1365,18 @@ def test_User_is_dataset_manager(self):
         # Grant change permission second
         form_data ={'dataset_acronym': self.test_dataset.acronym, 'username': self.user2.username, 'add_change_perm': 'Grant'}
         response = self.client.get(reverse('admin_dataset_manager'), form_data, follow=True)
-        self.assertContains(response, 'Change permission for user successfully granted.'
-                            .format(self.user2.username))
+        self.assertEqual(response.status_code, 200)
 
         # Revoke change permission
         form_data ={'dataset_acronym': self.test_dataset.acronym, 'username': self.user2.username,
                     'delete_change_perm': 'Revoke'}
         response = self.client.get(reverse('admin_dataset_manager'), form_data, follow=True)
-        self.assertContains(response, 'Change permission for user successfully revoked.'
-                            .format(self.user2.username))
-
+        self.assertEqual(response.status_code, 200)
 
     def test_Set_default_language(self):
         """
         Tests
-        :return: 
+        :return:
         """
         logged_in = self.client.login(username='test-user', password='test-user')
         self.assertTrue(logged_in)
@@ -1396,17 +1391,17 @@ def test_Set_default_language(self):
         # Make the user member of the group dataset managers
         dataset_manager_group = Group.objects.get(name='Dataset_Manager')
         dataset_manager_group.user_set.add(self.user)
-        assign_perm('dictionary.change_permission', self.user, self.test_dataset)
+        assign_perm('dictionary.change_dataset', self.user, self.test_dataset)
         response = self.client.get(reverse('admin_dataset_manager'), form_data, follow=True)
-        self.assertContains(response, 'The default language of')
+        self.assertEqual(response.status_code, 200)
 
         # Try to add a language that is not in the translation language set of the test dataset
         language = Language(name="nonexistingtestlanguage", language_code_2char="ts", language_code_3char='tst')
         language.save()
         form_data = {'dataset_acronym': self.test_dataset.acronym, 'default_language': language.id}
         response = self.client.get(reverse('admin_dataset_manager'), form_data, follow=True)
-        self.assertContains(response, '{} is not in the set of languages of dataset {}.'.format(
-                                                            language.name, self.test_dataset.acronym))
+        self.assertEqual(response.status_code, 200)
+
 
 class LemmaTests(TestCase):
 
@@ -1486,7 +1481,7 @@ def test_QueryLemmasWithoutGlosses(self):
 
         # Give the test user permission to change a dataset
         test_dataset = Dataset.objects.get(name=dataset_name)
-        assign_perm('view_permission', self.user, test_dataset)
+        assign_perm('dictionary.view_dataset', self.user, test_dataset)
         self.user.save()
 
         # search for the lemma without glosses: test_lemma_without_gloss
@@ -1514,7 +1509,7 @@ def test_QueryLemmasWithoutGlosses(self):
         response = client.post('/dictionary/lemma/', {'delete_lemmas': 'delete_lemmas'}, follow=True)
         self.assertContains(response, 'You do not have change permission on the dataset of the lemma you are attempting to delete.')
 
-        assign_perm('change_permission', self.user, test_dataset)
+        assign_perm('dictionary.change_dataset', self.user, test_dataset)
         self.user.save()
 
         response = client.post('/dictionary/lemma/?lemma_en=without', {'delete_lemmas': 'delete_lemmas'}, follow=True)
@@ -1612,8 +1607,8 @@ def test_create_handshape(self):
         # set the test dataset
         dataset_name = settings.DEFAULT_DATASET
         test_dataset = Dataset.objects.get(name=dataset_name)
-        assign_perm('view_permission', self.user, test_dataset)
-        assign_perm('change_permission', self.user, test_dataset)
+        assign_perm('dictionary.view_dataset', self.user, test_dataset)
+        assign_perm('dictionary.change_dataset', self.user, test_dataset)
 
         self.client.login(username='test-user', password='test-user')
 
@@ -1636,8 +1631,8 @@ def test_handshape_choices(self):
         # set the test dataset
         dataset_name = settings.DEFAULT_DATASET
         test_dataset = Dataset.objects.get(name=dataset_name)
-        assign_perm('view_permission', self.user, test_dataset)
-        assign_perm('change_permission', self.user, test_dataset)
+        assign_perm('dictionary.view_dataset', self.user, test_dataset)
+        assign_perm('dictionary.change_dataset', self.user, test_dataset)
 
         # Create 10 lemmas for use in testing
         language = Language.objects.get(id=get_default_language_id())
@@ -1804,7 +1799,7 @@ def test_SemanticField(self):
         #Create a client and log in
         client = Client(enforce_csrf_checks=False)
         client.login(username='test-user', password='test-user')
-        assign_perm('view_permission', self.user, test_dataset)
+        assign_perm('dictionary.view_dataset', self.user, test_dataset)
 
         # Create a lemma
         new_lemma = LemmaIdgloss(dataset=test_dataset)
@@ -2546,7 +2541,7 @@ def test_analysis_frequency(self):
 
         self.client.login(username='test-user', password='test-user')
 
-        assign_perm('view_permission', self.user, test_dataset)
+        assign_perm('dictionary.view_dataset', self.user, test_dataset)
 
         response = self.client.get('/analysis/frequencies/', follow=True)
         self.assertEqual(response.status_code,200)
@@ -3424,7 +3419,7 @@ def test_analysis_minimalpairs(self):
 
         self.client.login(username='test-user', password='test-user')
 
-        assign_perm('view_permission', self.user, test_dataset)
+        assign_perm('dictionary.view_dataset', self.user, test_dataset)
         response = self.client.get('/analysis/minimalpairs/', {'paginate_by':20}, follow=True)
 
         objects_on_page = response.__dict__['context_data']['objects_on_page']
@@ -3539,7 +3534,7 @@ def test_emptyvalues_minimalpairs(self):
 
         self.client.login(username='test-user', password='test-user')
 
-        assign_perm('view_permission', self.user, test_dataset)
+        assign_perm('dictionary.view_dataset', self.user, test_dataset)
         response = self.client.get('/analysis/minimalpairs/', {'paginate_by':20}, follow=True)
 
         objects_on_page = response.__dict__['context_data']['objects_on_page']
@@ -3736,10 +3731,10 @@ def test_crud_Senses(self):
         # Get the test dataset
         dataset_name = settings.DEFAULT_DATASET
         test_dataset = Dataset.objects.get(name=dataset_name)
-        assign_perm('change_permission', self.user, test_dataset)
+        assign_perm('dictionary.change_dataset', self.user, test_dataset)
         assign_perm('dictionary.add_gloss', self.user)
         assign_perm('dictionary.change_gloss', self.user)
-        assign_perm('view_permission', self.user, test_dataset)
+        assign_perm('dictionary.view_dataset', self.user, test_dataset)
         assign_perm('dictionary.search_gloss', self.user)
         self.user.save()
 
@@ -3905,12 +3900,12 @@ def test_Similar_Senses(self):
         # Get the test dataset
         dataset_name = settings.DEFAULT_DATASET
         test_dataset = Dataset.objects.get(name=dataset_name)
-        assign_perm('change_permission', self.user, test_dataset)
+        assign_perm('dictionary.change_dataset', self.user, test_dataset)
         assign_perm('dictionary.add_gloss', self.user)
         assign_perm('dictionary.change_gloss', self.user)
         assign_perm('dictionary.add_sense', self.user)
 
-        assign_perm('view_permission', self.user, test_dataset)
+        assign_perm('dictionary.view_dataset', self.user, test_dataset)
         assign_perm('dictionary.search_gloss', self.user)
         self.user.save()
 
@@ -4008,12 +4003,12 @@ def test_no_empty_translations_Senses(self):
         # Get the test dataset
         dataset_name = settings.DEFAULT_DATASET
         test_dataset = Dataset.objects.get(name=dataset_name)
-        assign_perm('change_permission', self.user, test_dataset)
+        assign_perm('dictionary.change_dataset', self.user, test_dataset)
         assign_perm('dictionary.add_gloss', self.user)
         assign_perm('dictionary.change_gloss', self.user)
         assign_perm('dictionary.add_sense', self.user)
 
-        assign_perm('view_permission', self.user, test_dataset)
+        assign_perm('dictionary.view_dataset', self.user, test_dataset)
         assign_perm('dictionary.search_gloss', self.user)
         self.user.save()
 
diff --git a/signbank/registration/views.py b/signbank/registration/views.py
index e4d62496c..f2de36fdd 100755
--- a/signbank/registration/views.py
+++ b/signbank/registration/views.py
@@ -137,7 +137,7 @@ class as the ``form_class`` keyword argument. The form class you
                     if dataset_obj.is_public:
 
                         # Give user access to view the database
-                        assign_perm('view_permission', new_user, dataset_obj)
+                        assign_perm('dictionary.view_dataset', new_user, dataset_obj)
 
                         for owner in owners_of_dataset:
 
@@ -314,7 +314,7 @@ def users_without_dataset(request):
                 continue
 
             user = User.objects.get(pk=int(user.split('_')[-1]))
-            assign_perm('view_permission', user, main_dataset)
+            assign_perm('dictionary.view_dataset', user, main_dataset)
 
             users_with_access.append(user.first_name + ' ' + user.last_name)
 

From 15f9e1e7d192fb3ad5ab02eda6b7e41a752898eb Mon Sep 17 00:00:00 2001
From: susanodd <mijnoog@kpnmail.nl>
Date: Fri, 23 Aug 2024 14:51:14 +0200
Subject: [PATCH 03/11] #1270: Permissions fixes.

---
 signbank/dictionary/adminviews.py | 33 +++++++++++++++----------------
 signbank/dictionary/tests.py      |  5 +----
 signbank/dictionary/update.py     | 14 ++++++-------
 3 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/signbank/dictionary/adminviews.py b/signbank/dictionary/adminviews.py
index 561670b16..5f06fece4 100755
--- a/signbank/dictionary/adminviews.py
+++ b/signbank/dictionary/adminviews.py
@@ -851,7 +851,7 @@ def get(self, request, *args, **kwargs):
                 return HttpResponseRedirect(reverse('registration:login'))
 
         dataset_of_requested_gloss = self.object.lemma.dataset
-        datasets_user_can_view = get_objects_for_user(request.user, ['dictionary.view_dataset'],
+        datasets_user_can_view = get_objects_for_user(request.user, 'view_permission',
                                                       Dataset, accept_global_perms=True, any_perm=True)
 
         if dataset_of_requested_gloss not in selected_datasets:
@@ -1292,7 +1292,7 @@ def get_context_data(self, **kwargs):
             context['dataset_choices'] = {}
             user = self.request.user
             if user.is_authenticated:
-                qs = get_objects_for_user(user, ['dictionary.view_dataset'], Dataset, accept_global_perms=True, any_perm=True)
+                qs = get_objects_for_user(user, 'view_permission', Dataset, accept_global_perms=True, any_perm=True)
                 dataset_choices = {}
                 for dataset in qs:
                     dataset_choices[dataset.acronym] = dataset.acronym
@@ -1477,7 +1477,7 @@ def get(self, request, *args, **kwargs):
                 return HttpResponseRedirect(reverse('registration:login'))
 
         dataset_of_requested_gloss = self.object.lemma.dataset
-        datasets_user_can_view = get_objects_for_user(request.user, ['dictionary.view_dataset'],
+        datasets_user_can_view = get_objects_for_user(request.user, 'view_permission',
                                                       Dataset, accept_global_perms=True, any_perm=True)
 
         if dataset_of_requested_gloss not in selected_datasets:
@@ -1586,7 +1586,7 @@ def get(self, request, *args, **kwargs):
                 return HttpResponseRedirect(reverse('registration:login'))
 
         dataset_of_requested_gloss = self.object.lemma.dataset
-        datasets_user_can_view = get_objects_for_user(request.user, ['dictionary.view_dataset'],
+        datasets_user_can_view = get_objects_for_user(request.user, 'view_permission',
                                                       Dataset, accept_global_perms=True, any_perm=True)
 
         if dataset_of_requested_gloss not in selected_datasets:
@@ -2916,7 +2916,7 @@ def get(self, request, *args, **kwargs):
                 return HttpResponseRedirect(reverse('registration:login'))
 
         dataset_of_requested_gloss = self.object.lemma.dataset
-        datasets_user_can_view = get_objects_for_user(request.user, ['dictionary.view_dataset'],
+        datasets_user_can_view = get_objects_for_user(request.user, 'view_permission',
                                                       Dataset, accept_global_perms=True, any_perm=True)
 
         if dataset_of_requested_gloss not in selected_datasets:
@@ -2982,7 +2982,7 @@ def get_context_data(self, **kwargs):
             context['dataset_choices'] = {}
             user = self.request.user
             if user.is_authenticated:
-                qs = get_objects_for_user(user, ['dictionary.view_dataset'],
+                qs = get_objects_for_user(user, 'view_permission',
                                           Dataset, accept_global_perms=True, any_perm=True)
                 dataset_choices = {}
                 for dataset in qs:
@@ -3128,7 +3128,7 @@ def get_context_data(self, **kwargs):
             context['dataset_choices'] = {}
             user = self.request.user
             if user.is_authenticated:
-                qs = get_objects_for_user(user, ['dictionary.view_dataset'],
+                qs = get_objects_for_user(user, 'view_permission',
                                           Dataset, accept_global_perms=True, any_perm=True)
                 dataset_choices = {}
                 for dataset in qs:
@@ -3553,7 +3553,7 @@ def render_to_request_response(self, context):
 
         # make sure the user can write to this dataset
         from guardian.shortcuts import get_objects_for_user, assign_perm
-        user_view_datasets = get_objects_for_user(self.request.user, ['dictionary.view_dataset'],
+        user_view_datasets = get_objects_for_user(self.request.user, 'view_permission',
                                                   Dataset, accept_global_perms=True, any_perm=True)
         may_request_dataset = True
         if dataset_object.is_public and not dataset_object in user_view_datasets:
@@ -3666,7 +3666,7 @@ def render_to_ecv_export_response(self, context):
 
         # make sure the user can write to this dataset
         # from guardian.shortcuts import get_objects_for_user
-        user_change_datasets = get_objects_for_user(self.request.user, 'change_permission', Dataset, accept_global_perms=False)
+        user_change_datasets = get_objects_for_user(self.request.user, 'change_dataset', Dataset, accept_global_perms=False)
         if not user_change_datasets or dataset_object not in user_change_datasets:
             messages.add_message(self.request, messages.ERROR, _('No permission to export dataset.'))
             return HttpResponseRedirect(reverse('admin_dataset_view'))
@@ -3737,7 +3737,6 @@ def get_queryset(self):
             datasets_with_public_glosses = get_datasets_with_public_glosses()
             viewable_datasets = list(
                 set([ds.id for ds in datasets_with_public_glosses]))
-            print('view: ', viewable_datasets)
             qs = Dataset.objects.filter(id__in=viewable_datasets)
             datasets_to_choose_from = qs.annotate(checked=ExpressionWrapper(Q(id__in=selected_dataset_ids),
                                                                             output_field=BooleanField())).order_by('acronym')
@@ -3912,7 +3911,7 @@ def render_to_add_user_response(self, context):
 
         from guardian.shortcuts import assign_perm, remove_perm
         datasets_user_can_change = get_objects_for_user(user_object, 'change_permission', Dataset, accept_global_perms=False)
-        datasets_user_can_view = get_objects_for_user(user_object, ['dictionary.view_dataset'],
+        datasets_user_can_view = get_objects_for_user(user_object, 'view_permission',
                                                       Dataset, accept_global_perms=False, any_perm=True)
         groups_user_is_in = Group.objects.filter(user=user_object)
 
@@ -3985,7 +3984,7 @@ def render_to_add_user_response(self, context):
                 manage_identifier += '_manage_view'
                 return HttpResponseRedirect(reverse('admin_dataset_manager') + '?' + manage_identifier)
             try:
-                assign_perm('change_permission', user_object, dataset_object)
+                assign_perm('dictionary.change_dataset', user_object, dataset_object)
 
                 # put user in Editor group
                 editor_group = Group.objects.get(name='Editor')
@@ -4614,7 +4613,7 @@ def get(self, request, *args, **kwargs):
             return HttpResponseRedirect(reverse('registration:login'))
 
         dataset = self.object
-        datasets_user_can_view = get_objects_for_user(request.user, ['dictionary.view_dataset'],
+        datasets_user_can_view = get_objects_for_user(request.user, 'view_permission',
                                                       Dataset, accept_global_perms=True, any_perm=True)
 
         if dataset not in datasets_user_can_view:
@@ -4955,7 +4954,7 @@ def get(self, request, *args, **kwargs):
                 return HttpResponseRedirect(reverse('registration:login'))
 
         dataset_of_requested_morpheme = self.object.lemma.dataset
-        datasets_user_can_view = get_objects_for_user(request.user, ['dictionary.view_dataset'],
+        datasets_user_can_view = get_objects_for_user(request.user, 'view_permission',
                                                       Dataset, accept_global_perms=False, any_perm=True)
 
         if dataset_of_requested_morpheme not in selected_datasets:
@@ -5200,7 +5199,7 @@ def get_context_data(self, **kwargs):
             context['dataset_choices'] = {}
             user = self.request.user
             if user.is_authenticated:
-                qs = get_objects_for_user(user, ['dictionary.view_dataset'],
+                qs = get_objects_for_user(user, 'view_permission',
                                           Dataset, accept_global_perms=False, any_perm=True)
                 dataset_choices = dict()
                 for dataset in qs:
@@ -6013,7 +6012,7 @@ def post(self, request, *args, **kwargs):
             # the template sets POST value 'delete_lemmas' to value 'delete_lemmas'
             messages.add_message(request, messages.WARNING, _("Incorrect deletion code."))
             return HttpResponseRedirect(reverse('dictionary:admin_lemma_list'))
-        datasets_user_can_change = get_objects_for_user(request.user, 'change_permission', Dataset,
+        datasets_user_can_change = get_objects_for_user(request.user, 'change_dataset', Dataset,
                                                         accept_global_perms=False)
         if not datasets_user_can_change:
             messages.add_message(request, messages.WARNING,
@@ -6354,7 +6353,7 @@ def get(self, request, *args, **kwargs):
             return HttpResponseRedirect(reverse('registration:login'))
 
         dataset_of_requested_lemma = self.object.dataset
-        datasets_user_can_view = get_objects_for_user(request.user, ['dictionary.view_dataset'],
+        datasets_user_can_view = get_objects_for_user(request.user, 'view_permission',
                                                       Dataset, accept_global_perms=False, any_perm=True)
 
         if dataset_of_requested_lemma not in selected_datasets:
diff --git a/signbank/dictionary/tests.py b/signbank/dictionary/tests.py
index 3e682254b..8b1ac1b7a 100644
--- a/signbank/dictionary/tests.py
+++ b/signbank/dictionary/tests.py
@@ -1,6 +1,4 @@
-import guardian.shortcuts
 from django.db.models import CharField, TextField
-#from django.forms import TextInput, Textarea, CharField
 from signbank.dictionary.adminviews import *
 from signbank.dictionary.forms import GlossCreateForm, FieldChoiceForm
 from signbank.dictionary.models import *
@@ -19,7 +17,7 @@
 from pathlib import Path
 from os import path
 
-from guardian.shortcuts import assign_perm
+from guardian.shortcuts import assign_perm, get_user_perms
 
 from signbank.video.models import GlossVideo
 from signbank.dictionary.views import gloss_api_get_sign_name_and_media_info
@@ -166,7 +164,6 @@ def test_createGloss(self):
         # Get the test dataset
         dataset_name = settings.DEFAULT_DATASET
         test_dataset = Dataset.objects.get(name=dataset_name)
-
         # Construct the Create Gloss form data
         create_gloss_form_data = {'dataset': test_dataset.id, 'select_or_new_lemma': "new"}
         for language in test_dataset.translation_languages.all():
diff --git a/signbank/dictionary/update.py b/signbank/dictionary/update.py
index a713c516c..5a794c1e4 100755
--- a/signbank/dictionary/update.py
+++ b/signbank/dictionary/update.py
@@ -64,6 +64,7 @@ def add_gloss(request):
         selected_datasets = Dataset.objects.filter(pk=request.POST['dataset'])
     else:
         selected_datasets = get_selected_datasets_for_user(request.user)
+
     dataset_languages = Language.objects.filter(dataset__in=selected_datasets).distinct()
 
     if dataset:
@@ -97,9 +98,9 @@ def add_gloss(request):
         except (ObjectDoesNotExist, IntegerField, ValueError, TypeError):
             return show_error(request, _("The given Lemma Idgloss ID is unknown."), form, dataset_languages)
 
-    # Check for 'change_permission' permission
-    if dataset and ('change_permission' not in get_user_perms(request.user, dataset)) \
-            and ('change_permission' not in get_group_perms(request.user, dataset))\
+    # Check for 'change_dataset' permission
+    if dataset and ('change_dataset' not in get_user_perms(request.user, dataset)) \
+            and ('change_dataset' not in get_group_perms(request.user, dataset))\
             and not request.user.is_staff:
         return show_error(request, _("You are not authorized to change the selected dataset."), form, dataset_languages)
 
@@ -155,7 +156,6 @@ def add_gloss(request):
             for ua in user_affiliations:
                 new_affiliation, created = AffiliatedGloss.objects.get_or_create(affiliation=ua.affiliation,
                                                                                  gloss=gloss)
-
     except ValidationError as ve:
         return show_error(request, ve.message, form, dataset_languages)
 
@@ -2319,9 +2319,9 @@ def add_morpheme(request):
                                  _("The given Lemma Idgloss ID is unknown."))
             return render(request, 'dictionary/add_morpheme.html', {'add_morpheme_form': form})
 
-    # Check for 'change_permission' permission
-    if dataset and ('change_permission' not in get_user_perms(request.user, dataset)) \
-            and ('change_permission' not in get_group_perms(request.user, dataset))\
+    # Check for 'change_dataset' permission
+    if dataset and ('change_dataset' not in get_user_perms(request.user, dataset)) \
+            and ('change_dataset' not in get_group_perms(request.user, dataset))\
             and not request.user.is_staff:
         messages.add_message(request, messages.ERROR, _("You are not authorized to change the selected dataset."))
         return render(request, 'dictionary/add_morpheme.html', {'add_morpheme_form': form})

From 1d05694b0c79b9fa232dd4c4bf233bd17760b66e Mon Sep 17 00:00:00 2001
From: susanodd <mijnoog@kpnmail.nl>
Date: Fri, 23 Aug 2024 15:24:59 +0200
Subject: [PATCH 04/11] #1270: Restored messages to tests manage dataset.

Fixed permissions that were causing to fail.
---
 signbank/dictionary/adminviews.py |  9 ++++-----
 signbank/dictionary/tests.py      | 22 ++++++++++++++++------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/signbank/dictionary/adminviews.py b/signbank/dictionary/adminviews.py
index 5f06fece4..20e3683b2 100755
--- a/signbank/dictionary/adminviews.py
+++ b/signbank/dictionary/adminviews.py
@@ -3811,7 +3811,7 @@ def check_user_permissions_for_managing_dataset(self, dataset_object):
 
         # make sure the user can write to this dataset
         # from guardian.shortcuts import get_objects_for_user
-        user_change_datasets = get_objects_for_user(self.request.user, 'change_permission', Dataset,
+        user_change_datasets = get_objects_for_user(self.request.user, 'change_dataset', Dataset,
                                                     accept_global_perms=False)
         if not user_change_datasets or dataset_object not in user_change_datasets:
             messages.add_message(self.request, messages.ERROR, _('No permission to modify dataset permissions.'))
@@ -3910,8 +3910,8 @@ def render_to_add_user_response(self, context):
         manage_identifier = 'dataset_' + dataset_object.acronym.replace(' ','')
 
         from guardian.shortcuts import assign_perm, remove_perm
-        datasets_user_can_change = get_objects_for_user(user_object, 'change_permission', Dataset, accept_global_perms=False)
-        datasets_user_can_view = get_objects_for_user(user_object, 'view_permission',
+        datasets_user_can_change = get_objects_for_user(user_object, 'change_dataset', Dataset, accept_global_perms=False)
+        datasets_user_can_view = get_objects_for_user(user_object, 'view_dataset',
                                                       Dataset, accept_global_perms=False, any_perm=True)
         groups_user_is_in = Group.objects.filter(user=user_object)
 
@@ -4004,7 +4004,6 @@ def render_to_add_user_response(self, context):
 
         if 'delete_view_perm' in self.request.GET:
             manage_identifier += '_manage_view'
-
             if dataset_object in datasets_user_can_view:
                 if user_object.is_staff or user_object.is_superuser:
                     messages.add_message(self.request, messages.ERROR,
@@ -4015,7 +4014,7 @@ def render_to_add_user_response(self, context):
                         # also need to remove change_dataset perm in this case
                         from guardian.shortcuts import remove_perm
                         remove_perm('dictionary.view_dataset', user_object, dataset_object)
-                        remove_perm('change_dataset', user_object, dataset_object)
+                        remove_perm('dictionary.change_dataset', user_object, dataset_object)
                         messages.add_message(self.request, messages.INFO,
                                              _('View (and change) permission for user successfully revoked.'))
                     except (PermissionError, SystemError, OSError):
diff --git a/signbank/dictionary/tests.py b/signbank/dictionary/tests.py
index 8b1ac1b7a..4f75b4432 100644
--- a/signbank/dictionary/tests.py
+++ b/signbank/dictionary/tests.py
@@ -1340,19 +1340,25 @@ def test_User_is_dataset_manager(self):
         assign_perm('dictionary.change_dataset', self.user, self.test_dataset)
 
         # Grant view permission
-        form_data ={'dataset_acronym': self.test_dataset.acronym, 'username': self.user2.username, 'add_view_perm': 'Grant'}
+        form_data = {'dataset_acronym': self.test_dataset.acronym, 'username': self.user2.username, 'add_view_perm': 'Grant'}
         response = self.client.get(reverse('admin_dataset_manager'), form_data, follow=True)
+        self.assertContains(response, 'View permission for user successfully granted.'
+                            .format(self.user2.username, self.user2.first_name, self.user2.last_name))
         self.assertEqual(response.status_code, 200)
 
         # Revoke view permission
         form_data = {'dataset_acronym': self.test_dataset.acronym, 'username': self.user2.username,
-                    'delete_view_perm': 'Revoke'}
+                     'delete_view_perm': 'Revoke'}
         response = self.client.get(reverse('admin_dataset_manager'), form_data, follow=True)
+        self.assertContains(response, 'View (and change) permission for user successfully revoked.'
+                            .format(self.user2.username))
         self.assertEqual(response.status_code, 200)
 
         # Grant change permission without view permission
-        form_data ={'dataset_acronym': self.test_dataset.acronym, 'username': self.user2.username, 'add_change_perm': 'Grant'}
+        form_data = {'dataset_acronym': self.test_dataset.acronym, 'username': self.user2.username, 'add_change_perm': 'Grant'}
         response = self.client.get(reverse('admin_dataset_manager'), form_data, follow=True)
+        self.assertContains(response, 'User does not have view permission for this dataset. Please grant view permission first.'
+                            .format(self.user2.username, self.user2.first_name, self.user2.last_name))
         self.assertEqual(response.status_code, 200)
 
         # Grant change permission with view permission
@@ -1360,14 +1366,18 @@ def test_User_is_dataset_manager(self):
         form_data = {'dataset_acronym': self.test_dataset.acronym, 'username': self.user2.username, 'add_view_perm': 'Grant'}
         response = self.client.get(reverse('admin_dataset_manager'), form_data, follow=True)
         # Grant change permission second
-        form_data ={'dataset_acronym': self.test_dataset.acronym, 'username': self.user2.username, 'add_change_perm': 'Grant'}
+        form_data = {'dataset_acronym': self.test_dataset.acronym, 'username': self.user2.username, 'add_change_perm': 'Grant'}
         response = self.client.get(reverse('admin_dataset_manager'), form_data, follow=True)
+        self.assertContains(response, 'Change permission for user successfully granted.'
+                            .format(self.user2.username))
         self.assertEqual(response.status_code, 200)
 
         # Revoke change permission
-        form_data ={'dataset_acronym': self.test_dataset.acronym, 'username': self.user2.username,
-                    'delete_change_perm': 'Revoke'}
+        form_data = {'dataset_acronym': self.test_dataset.acronym, 'username': self.user2.username,
+                     'delete_change_perm': 'Revoke'}
         response = self.client.get(reverse('admin_dataset_manager'), form_data, follow=True)
+        self.assertContains(response, 'Change permission for user successfully revoked.'
+                            .format(self.user2.username))
         self.assertEqual(response.status_code, 200)
 
     def test_Set_default_language(self):

From 428b6b143e5f733e8ad37598e0e524b5b2b8d225 Mon Sep 17 00:00:00 2001
From: susanodd <mijnoog@kpnmail.nl>
Date: Fri, 23 Aug 2024 15:30:55 +0200
Subject: [PATCH 05/11] #1270: Added back message to default language test.

---
 signbank/dictionary/tests.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/signbank/dictionary/tests.py b/signbank/dictionary/tests.py
index 4f75b4432..06b2be41e 100644
--- a/signbank/dictionary/tests.py
+++ b/signbank/dictionary/tests.py
@@ -1400,6 +1400,7 @@ def test_Set_default_language(self):
         dataset_manager_group.user_set.add(self.user)
         assign_perm('dictionary.change_dataset', self.user, self.test_dataset)
         response = self.client.get(reverse('admin_dataset_manager'), form_data, follow=True)
+        self.assertContains(response, 'The default language of')
         self.assertEqual(response.status_code, 200)
 
         # Try to add a language that is not in the translation language set of the test dataset
@@ -1407,6 +1408,8 @@ def test_Set_default_language(self):
         language.save()
         form_data = {'dataset_acronym': self.test_dataset.acronym, 'default_language': language.id}
         response = self.client.get(reverse('admin_dataset_manager'), form_data, follow=True)
+        self.assertContains(response, '{} is not in the set of languages of dataset {}.'.format(
+                                                            language.name, self.test_dataset.acronym))
         self.assertEqual(response.status_code, 200)
 
 

From 64d161218ba2f5c547161bf701092d5ec7ab26fc Mon Sep 17 00:00:00 2001
From: susanodd <mijnoog@kpnmail.nl>
Date: Wed, 28 Aug 2024 16:01:54 +0200
Subject: [PATCH 06/11] #1270: Empty initial database, restored permissions.

---
 signbank/abstract_machine.py                  |  4 +-
 signbank/context_processors.py                |  2 +-
 signbank/dictionary/adminviews.py             | 42 +++++++-------
 .../dictionary/add_annotated_sentence.html    |  2 +-
 .../templates/dictionary/add_gloss.html       |  4 +-
 .../templates/dictionary/add_lemma.html       |  2 +-
 .../templates/dictionary/add_morpheme.html    |  4 +-
 .../dictionary/add_sentence_video.html        |  2 +-
 .../dictionary/admin_dataset_list.html        |  8 +--
 .../dictionary/admin_dataset_manager.html     |  2 +-
 .../dictionary/admin_dataset_select_list.html |  2 +-
 .../dictionary/admin_lemma_list.html          |  2 +-
 .../dictionary/admin_morpheme_list.html       |  2 +-
 .../templates/dictionary/affiliationtags.html |  4 +-
 .../templates/dictionary/dataset_detail.html  |  4 +-
 .../dictionary/dataset_frequency.html         | 14 ++---
 .../dictionary/edit_annotated_sentence.html   |  2 +-
 .../templates/dictionary/gloss_detail.html    | 58 +++++++++----------
 .../templates/dictionary/glosstags.html       |  4 +-
 .../templates/dictionary/morpheme_detail.html |  6 +-
 .../templates/dictionary/morphemetags.html    |  4 +-
 signbank/dictionary/update.py                 | 20 +++----
 signbank/dictionary/views.py                  | 10 ++--
 signbank/gloss_morphology_update.py           |  2 +-
 signbank/gloss_update.py                      | 12 ++--
 signbank/manage_videos.py                     |  4 +-
 signbank/registration/views.py                |  4 +-
 signbank/tools.py                             |  2 +-
 28 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/signbank/abstract_machine.py b/signbank/abstract_machine.py
index e8e362c1a..9b364b919 100644
--- a/signbank/abstract_machine.py
+++ b/signbank/abstract_machine.py
@@ -335,7 +335,7 @@ def csv_create_gloss(request, datasetid):
     if not dataset or not request.user.is_authenticated:
         return JsonResponse({})
 
-    change_permit_datasets = get_objects_for_user(request.user, 'change_permission', Dataset)
+    change_permit_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset)
     if dataset not in change_permit_datasets:
         return JsonResponse({})
 
@@ -374,7 +374,7 @@ def api_create_gloss(request, datasetid):
         results['errors'] = [gettext("Dataset ID does not exist.")]
         return JsonResponse(results)
 
-    change_permit_datasets = get_objects_for_user(request.user, 'change_permission', Dataset)
+    change_permit_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset)
     if dataset not in change_permit_datasets:
         results['errors'] = [gettext("No change permission for dataset for user ") + str(request.user)]
         return JsonResponse(results)
diff --git a/signbank/context_processors.py b/signbank/context_processors.py
index 544256f4a..19ff4e365 100755
--- a/signbank/context_processors.py
+++ b/signbank/context_processors.py
@@ -26,7 +26,7 @@ def url(request):
                 viewable_datasets.append(dataset)
                 continue
             permissions_for_dataset = get_user_perms(request.user, dataset)
-            if 'view_permission' in permissions_for_dataset:
+            if 'view_dataset' in permissions_for_dataset:
                 viewable_datasets.append(dataset)
 
     if 'dark_mode' not in request.session.keys():
diff --git a/signbank/dictionary/adminviews.py b/signbank/dictionary/adminviews.py
index 20e3683b2..be88be30a 100755
--- a/signbank/dictionary/adminviews.py
+++ b/signbank/dictionary/adminviews.py
@@ -414,7 +414,7 @@ def render_to_ecv_export_response(self):
         # make sure the user can write to this dataset
         import guardian
         # from guardian.shortcuts import get_objects_for_user
-        user_change_datasets = guardian.shortcuts.get_objects_for_user(self.request.user, 'change_permission', Dataset)
+        user_change_datasets = guardian.shortcuts.get_objects_for_user(self.request.user, 'change_dataset', Dataset)
         if not user_change_datasets or dataset_object not in user_change_datasets:
             messages.add_message(self.request, messages.ERROR, _('No permission to export dataset.'))
             return HttpResponseRedirect(settings.PREFIX_URL + '/signs/search/')
@@ -851,7 +851,7 @@ def get(self, request, *args, **kwargs):
                 return HttpResponseRedirect(reverse('registration:login'))
 
         dataset_of_requested_gloss = self.object.lemma.dataset
-        datasets_user_can_view = get_objects_for_user(request.user, 'view_permission',
+        datasets_user_can_view = get_objects_for_user(request.user, 'view_dataset',
                                                       Dataset, accept_global_perms=True, any_perm=True)
 
         if dataset_of_requested_gloss not in selected_datasets:
@@ -1292,7 +1292,7 @@ def get_context_data(self, **kwargs):
             context['dataset_choices'] = {}
             user = self.request.user
             if user.is_authenticated:
-                qs = get_objects_for_user(user, 'view_permission', Dataset, accept_global_perms=True, any_perm=True)
+                qs = get_objects_for_user(user, 'view_dataset', Dataset, accept_global_perms=True, any_perm=True)
                 dataset_choices = {}
                 for dataset in qs:
                     dataset_choices[dataset.acronym] = dataset.acronym
@@ -1477,7 +1477,7 @@ def get(self, request, *args, **kwargs):
                 return HttpResponseRedirect(reverse('registration:login'))
 
         dataset_of_requested_gloss = self.object.lemma.dataset
-        datasets_user_can_view = get_objects_for_user(request.user, 'view_permission',
+        datasets_user_can_view = get_objects_for_user(request.user, 'view_dataset',
                                                       Dataset, accept_global_perms=True, any_perm=True)
 
         if dataset_of_requested_gloss not in selected_datasets:
@@ -1586,7 +1586,7 @@ def get(self, request, *args, **kwargs):
                 return HttpResponseRedirect(reverse('registration:login'))
 
         dataset_of_requested_gloss = self.object.lemma.dataset
-        datasets_user_can_view = get_objects_for_user(request.user, 'view_permission',
+        datasets_user_can_view = get_objects_for_user(request.user, 'view_dataset',
                                                       Dataset, accept_global_perms=True, any_perm=True)
 
         if dataset_of_requested_gloss not in selected_datasets:
@@ -2916,7 +2916,7 @@ def get(self, request, *args, **kwargs):
                 return HttpResponseRedirect(reverse('registration:login'))
 
         dataset_of_requested_gloss = self.object.lemma.dataset
-        datasets_user_can_view = get_objects_for_user(request.user, 'view_permission',
+        datasets_user_can_view = get_objects_for_user(request.user, 'view_dataset',
                                                       Dataset, accept_global_perms=True, any_perm=True)
 
         if dataset_of_requested_gloss not in selected_datasets:
@@ -2982,7 +2982,7 @@ def get_context_data(self, **kwargs):
             context['dataset_choices'] = {}
             user = self.request.user
             if user.is_authenticated:
-                qs = get_objects_for_user(user, 'view_permission',
+                qs = get_objects_for_user(user, 'view_dataset',
                                           Dataset, accept_global_perms=True, any_perm=True)
                 dataset_choices = {}
                 for dataset in qs:
@@ -3128,7 +3128,7 @@ def get_context_data(self, **kwargs):
             context['dataset_choices'] = {}
             user = self.request.user
             if user.is_authenticated:
-                qs = get_objects_for_user(user, 'view_permission',
+                qs = get_objects_for_user(user, 'view_dataset',
                                           Dataset, accept_global_perms=True, any_perm=True)
                 dataset_choices = {}
                 for dataset in qs:
@@ -3553,7 +3553,7 @@ def render_to_request_response(self, context):
 
         # make sure the user can write to this dataset
         from guardian.shortcuts import get_objects_for_user, assign_perm
-        user_view_datasets = get_objects_for_user(self.request.user, 'view_permission',
+        user_view_datasets = get_objects_for_user(self.request.user, 'view_dataset',
                                                   Dataset, accept_global_perms=True, any_perm=True)
         may_request_dataset = True
         if dataset_object.is_public and not dataset_object in user_view_datasets:
@@ -4036,8 +4036,8 @@ def render_to_add_user_response(self, context):
                 else:
                     # can remove permission
                     try:
-                        remove_perm('change_permission', user_object, dataset_object)
-                        other_datasets_user_can_change = get_objects_for_user(user_object, 'change_permission', Dataset,
+                        remove_perm('change_dataset', user_object, dataset_object)
+                        other_datasets_user_can_change = get_objects_for_user(user_object, 'change_dataset', Dataset,
                                                                             accept_global_perms=True)
                         if len(other_datasets_user_can_change) == 0:
                             # this was the only dataset the user could change
@@ -4180,7 +4180,7 @@ def get_queryset(self):
             checker.prefetch_perms(qs)
 
             for dataset in qs:
-                checker.has_perm('change_permission', dataset)
+                checker.has_perm('change_dataset', dataset)
 
             return qs
         else:
@@ -4385,7 +4385,7 @@ def get_context_data(self, **kwargs):
         selected_datasets = get_selected_datasets_for_user(self.request.user)
 
         managed_datasets = []
-        change_dataset_permission = get_objects_for_user(self.request.user, 'change_permission', Dataset)
+        change_dataset_permission = get_objects_for_user(self.request.user, 'change_dataset', Dataset)
         for dataset in selected_datasets:
             if dataset in change_dataset_permission:
                 dataset_excluded_choices = dataset.exclude_choices.all()
@@ -4510,7 +4510,7 @@ def get_queryset(self):
             checker.prefetch_perms(qs)
 
             for dataset in qs:
-                checker.has_perm('change_permission', dataset)
+                checker.has_perm('change_dataset', dataset)
 
             return qs
         else:
@@ -4612,7 +4612,7 @@ def get(self, request, *args, **kwargs):
             return HttpResponseRedirect(reverse('registration:login'))
 
         dataset = self.object
-        datasets_user_can_view = get_objects_for_user(request.user, 'view_permission',
+        datasets_user_can_view = get_objects_for_user(request.user, 'view_dataset',
                                                       Dataset, accept_global_perms=True, any_perm=True)
 
         if dataset not in datasets_user_can_view:
@@ -4761,7 +4761,7 @@ def render_to_process_speakers_response(self, context):
 
         # make sure the user can write to this dataset
         # from guardian.shortcuts import get_objects_for_user
-        user_change_datasets = get_objects_for_user(self.request.user, 'change_permission', Dataset, accept_global_perms=False)
+        user_change_datasets = get_objects_for_user(self.request.user, 'change_dataset', Dataset, accept_global_perms=False)
         if not user_change_datasets.exists() or dataset_object not in user_change_datasets:
             messages.add_message(self.request, messages.ERROR, _('No permission to import speakers for this dataset.'))
             return HttpResponseRedirect(reverse('admin_dataset_view'))
@@ -4800,7 +4800,7 @@ def render_to_create_corpus_response(self, context):
 
         # make sure the user can write to this dataset
         # from guardian.shortcuts import get_objects_for_user
-        user_change_datasets = get_objects_for_user(self.request.user, 'change_permission', Dataset, accept_global_perms=False)
+        user_change_datasets = get_objects_for_user(self.request.user, 'change_dataset', Dataset, accept_global_perms=False)
         if not user_change_datasets.exists() or dataset_object not in user_change_datasets:
             messages.add_message(self.request, messages.ERROR, _('No permission to create a corpus for this dataset.'))
             return HttpResponseRedirect(reverse('admin_dataset_view'))
@@ -4840,7 +4840,7 @@ def render_to_update_corpus_response(self, context):
 
         # make sure the user can write to this dataset
         # from guardian.shortcuts import get_objects_for_user
-        user_change_datasets = get_objects_for_user(self.request.user, 'change_permission', Dataset, accept_global_perms=False)
+        user_change_datasets = get_objects_for_user(self.request.user, 'change_dataset', Dataset, accept_global_perms=False)
         if not user_change_datasets.exists() or dataset_object not in user_change_datasets:
             messages.add_message(self.request, messages.ERROR, _('No permission to update the corpus for this dataset.'))
             return HttpResponseRedirect(reverse('admin_dataset_view'))
@@ -4953,7 +4953,7 @@ def get(self, request, *args, **kwargs):
                 return HttpResponseRedirect(reverse('registration:login'))
 
         dataset_of_requested_morpheme = self.object.lemma.dataset
-        datasets_user_can_view = get_objects_for_user(request.user, 'view_permission',
+        datasets_user_can_view = get_objects_for_user(request.user, 'view_dataset',
                                                       Dataset, accept_global_perms=False, any_perm=True)
 
         if dataset_of_requested_morpheme not in selected_datasets:
@@ -5198,7 +5198,7 @@ def get_context_data(self, **kwargs):
             context['dataset_choices'] = {}
             user = self.request.user
             if user.is_authenticated:
-                qs = get_objects_for_user(user, 'view_permission',
+                qs = get_objects_for_user(user, 'view_dataset',
                                           Dataset, accept_global_perms=False, any_perm=True)
                 dataset_choices = dict()
                 for dataset in qs:
@@ -6352,7 +6352,7 @@ def get(self, request, *args, **kwargs):
             return HttpResponseRedirect(reverse('registration:login'))
 
         dataset_of_requested_lemma = self.object.dataset
-        datasets_user_can_view = get_objects_for_user(request.user, 'view_permission',
+        datasets_user_can_view = get_objects_for_user(request.user, 'view_dataset',
                                                       Dataset, accept_global_perms=False, any_perm=True)
 
         if dataset_of_requested_lemma not in selected_datasets:
diff --git a/signbank/dictionary/templates/dictionary/add_annotated_sentence.html b/signbank/dictionary/templates/dictionary/add_annotated_sentence.html
index ac33eb3f3..8277656e2 100644
--- a/signbank/dictionary/templates/dictionary/add_annotated_sentence.html
+++ b/signbank/dictionary/templates/dictionary/add_annotated_sentence.html
@@ -13,7 +13,7 @@
 {% block content %}
 
 {% get_obj_perms request.user for gloss.lemma.dataset as "dataset_perms" %}
-{% if "change_permission" in dataset_perms %}
+{% if "change_dataset" in dataset_perms %}
 <div class='editform', style="width:500px">
     <fieldset>
         <h4>{% trans "Upload New Annotated Sentence" %}</h4>
diff --git a/signbank/dictionary/templates/dictionary/add_gloss.html b/signbank/dictionary/templates/dictionary/add_gloss.html
index 7fa1ca7dd..2ebc8cf43 100755
--- a/signbank/dictionary/templates/dictionary/add_gloss.html
+++ b/signbank/dictionary/templates/dictionary/add_gloss.html
@@ -26,7 +26,7 @@
         var permission = 0;
         {% for s_dataset in selected_datasets %}
         {% get_obj_perms request.user for s_dataset as "dataset_perms" %}
-        {% if "change_permission" in dataset_perms %}
+        {% if "change_dataset" in dataset_perms %}
         permission += 1;
         {% endif %}
         {% endfor %}
@@ -99,7 +99,7 @@
                  <td class='td td-light'><select id="id_dataset" name="dataset" required="">
                          {% for s_dataset in selected_datasets %}
                          {% get_obj_perms request.user for s_dataset as "dataset_perms" %}
-                         {% if "change_permission" in dataset_perms %}
+                         {% if "change_dataset" in dataset_perms %}
                          {% if last_used_dataset and last_used_dataset == s_dataset.acronym %}
                          <option value="{{ s_dataset.id }}" selected="selected"
                                  dataset_languages="{% for dataset_lang in s_dataset.translation_languages.all %}{{ dataset_lang.language_code_2char }}{% if not forloop.last %},{% endif %}{% endfor %}">{{ s_dataset.acronym }}</option>
diff --git a/signbank/dictionary/templates/dictionary/add_lemma.html b/signbank/dictionary/templates/dictionary/add_lemma.html
index cae120813..7be3ffcc9 100755
--- a/signbank/dictionary/templates/dictionary/add_lemma.html
+++ b/signbank/dictionary/templates/dictionary/add_lemma.html
@@ -58,7 +58,7 @@
                  <td class='td td-light'><select id="id_dataset" name="dataset" required="">
                          {% for s_dataset in selected_datasets %}
                          {% get_obj_perms request.user for s_dataset as "dataset_perms" %}
-                         {% if "change_permission" in dataset_perms %}
+                         {% if "change_dataset" in dataset_perms %}
                          {% if last_used_dataset and last_used_dataset == s_dataset.acronym %}
                          <option value="{{ s_dataset.id }}" selected="selected"
                                  dataset_languages="{% for dataset_lang in s_dataset.translation_languages.all %}{{ dataset_lang.language_code_2char }}{% if not forloop.last %},{% endif %}{% endfor %}">{{ s_dataset.acronym }}</option>
diff --git a/signbank/dictionary/templates/dictionary/add_morpheme.html b/signbank/dictionary/templates/dictionary/add_morpheme.html
index fa0287e8a..72095237b 100644
--- a/signbank/dictionary/templates/dictionary/add_morpheme.html
+++ b/signbank/dictionary/templates/dictionary/add_morpheme.html
@@ -18,7 +18,7 @@
         var permission = 0;
         {% for s_dataset in selected_datasets %}
         {% get_obj_perms request.user for s_dataset as "dataset_perms" %}
-        {% if "change_permission" in dataset_perms %}
+        {% if "change_dataset" in dataset_perms %}
         permission += 1;
         {% endif %}
         {% endfor %}
@@ -82,7 +82,7 @@
 
                          {% for s_dataset in selected_datasets %}
                          {% get_obj_perms request.user for s_dataset as "dataset_perms" %}
-                         {% if "change_permission" in dataset_perms %}
+                         {% if "change_dataset" in dataset_perms %}
                          {% if last_used_dataset and last_used_dataset == s_dataset.acronym %}
                          <option value="{{ s_dataset.id }}" selected="selected"
                                  dataset_languages="{% for dataset_lang in s_dataset.translation_languages.all %}{{ dataset_lang.language_code_2char }}{% if not forloop.last %},{% endif %}{% endfor %}">{{ s_dataset.acronym }}</option>
diff --git a/signbank/dictionary/templates/dictionary/add_sentence_video.html b/signbank/dictionary/templates/dictionary/add_sentence_video.html
index 313e51d61..845bf98a8 100644
--- a/signbank/dictionary/templates/dictionary/add_sentence_video.html
+++ b/signbank/dictionary/templates/dictionary/add_sentence_video.html
@@ -15,7 +15,7 @@
 {% block content %}
 
 {% get_obj_perms request.user for gloss.lemma.dataset as "dataset_perms" %}
-{% if "change_permission" in dataset_perms %}
+{% if "change_dataset" in dataset_perms %}
 <div class='editform', style="width:500px">
     <fieldset>
         <legend>{% trans "Upload New Example Sentence Video" %}</legend>
diff --git a/signbank/dictionary/templates/dictionary/admin_dataset_list.html b/signbank/dictionary/templates/dictionary/admin_dataset_list.html
index 526268520..7c0b6471c 100644
--- a/signbank/dictionary/templates/dictionary/admin_dataset_list.html
+++ b/signbank/dictionary/templates/dictionary/admin_dataset_list.html
@@ -55,7 +55,7 @@ <h3>{% trans "Available Datasets" %}</h3>
             {% if not user.is_anonymous %}
             <td>
                 {% get_obj_perms request.user for dataset as "dataset_perms" %}
-                {% if "view_permission" in dataset_perms %}
+                {% if "view_dataset" in dataset_perms %}
                 {% trans "Yes" %}
                 {% else %}
                 {% trans "No" %}
@@ -63,7 +63,7 @@ <h3>{% trans "Available Datasets" %}</h3>
             </td>
             <td>
                 {% get_obj_perms request.user for dataset as "dataset_perms" %}
-                {% if "change_permission" in dataset_perms %}
+                {% if "change_dataset" in dataset_perms %}
                 {% trans "Yes" %}
                 {% else %}
                 {% trans "No" %}
@@ -72,7 +72,7 @@ <h3>{% trans "Available Datasets" %}</h3>
             <td>
                 {% if dataset.is_public %}
                 {% get_obj_perms request.user for dataset as "dataset_perms" %}
-                {% if not "view_permission" in dataset_perms %}
+                {% if not "view_dataset" in dataset_perms %}
 
                 <div data-toggle="collapse" href="#dataset_{{dataset.name|cut:' '}}_request_view"><button>{% trans "Request View Access" %}</button></div>
                 <div id='dataset_{{dataset.name|cut:" "}}_request_view' class='collapse'>
@@ -104,7 +104,7 @@ <h3>{% trans "Available Datasets" %}</h3>
 
             <td>
                 {% get_obj_perms request.user for dataset as "dataset_perms" %}
-                {% if "change_permission" in dataset_perms and dataset.lemmaidgloss__gloss__count %}
+                {% if "change_dataset" in dataset_perms and dataset.lemmaidgloss__gloss__count %}
                 <form name='export_ecv_form' id='export_ecv_form' method='get'>
                     <div class="hidden">
                         <input name='dataset_acronym' class='form-control' value='{{dataset.acronym}}' >
diff --git a/signbank/dictionary/templates/dictionary/admin_dataset_manager.html b/signbank/dictionary/templates/dictionary/admin_dataset_manager.html
index dc6979944..a17b6d094 100644
--- a/signbank/dictionary/templates/dictionary/admin_dataset_manager.html
+++ b/signbank/dictionary/templates/dictionary/admin_dataset_manager.html
@@ -107,7 +107,7 @@ <h3>{% trans "Manage Datasets" %}</h3>
       {% for dataset in object_list %}
       {% if request.user|has_group:"Dataset_Manager" %}
       {% get_obj_perms request.user for dataset as "dataset_perms" %}
-      {% if "change_permission" in dataset_perms %}
+      {% if "change_dataset" in dataset_perms %}
         <tr style="z-index:0;">
             <td>
                 <table class="table table-condensed">
diff --git a/signbank/dictionary/templates/dictionary/admin_dataset_select_list.html b/signbank/dictionary/templates/dictionary/admin_dataset_select_list.html
index 3aeb897f9..0ead5345d 100644
--- a/signbank/dictionary/templates/dictionary/admin_dataset_select_list.html
+++ b/signbank/dictionary/templates/dictionary/admin_dataset_select_list.html
@@ -50,7 +50,7 @@ <h3>{% trans "Select Datasets" %}</h3>
     <tbody class="tbody tbody-light">
       {% for dataset in object_list %}
           {% get_obj_perms request.user for dataset as "dataset_perms" %}
-            {% if "view_permission" in dataset_perms %}
+            {% if "view_dataset" in dataset_perms %}
             <tr>
                 <td class='td td-light'><input type="checkbox" name="dataset_{{ dataset.acronym }}" value="true" {% if dataset.user.0.user %}checked{% endif %}/></td>
                 <td class='td td-light'>
diff --git a/signbank/dictionary/templates/dictionary/admin_lemma_list.html b/signbank/dictionary/templates/dictionary/admin_lemma_list.html
index 729dbb6d5..fbec887a1 100644
--- a/signbank/dictionary/templates/dictionary/admin_lemma_list.html
+++ b/signbank/dictionary/templates/dictionary/admin_lemma_list.html
@@ -261,7 +261,7 @@ <h3>{% trans "Lemmas" %}</h3>
             </td>
             <td>
             {% get_obj_perms request.user for lemma.dataset as "dataset_perms" %}
-            {% if "change_permission" in dataset_perms %}
+            {% if "change_dataset" in dataset_perms %}
                 <a class="change-entry" href="{% url 'dictionary:change_lemma' lemma.pk %}" >
                     <span class="glyphicon glyphicon-pencil" data-toggle="tooltip" data-original-title="{% trans 'Update' %}"></span>
                 </a>
diff --git a/signbank/dictionary/templates/dictionary/admin_morpheme_list.html b/signbank/dictionary/templates/dictionary/admin_morpheme_list.html
index 96215d69b..767cb56ed 100755
--- a/signbank/dictionary/templates/dictionary/admin_morpheme_list.html
+++ b/signbank/dictionary/templates/dictionary/admin_morpheme_list.html
@@ -521,7 +521,7 @@
                          {% for s_dataset in selected_datasets %}
 
                          {% get_obj_perms request.user for s_dataset as "dataset_perms" %}
-                         {% if "change_permission" in dataset_perms %}
+                         {% if "change_dataset" in dataset_perms %}
                          {% if last_used_dataset and last_used_dataset == s_dataset.acronym %}
                          <option value="{{s_dataset.id}}" selected="selected"
                                  dataset_languages="{% for dataset_lang in s_dataset.translation_languages.all %}{{dataset_lang.language_code_2char}}{% if not forloop.last %},{% endif %}{% endfor %}">{{s_dataset.acronym}}</option>
diff --git a/signbank/dictionary/templates/dictionary/affiliationtags.html b/signbank/dictionary/templates/dictionary/affiliationtags.html
index 6dccc3b67..ba29f040b 100644
--- a/signbank/dictionary/templates/dictionary/affiliationtags.html
+++ b/signbank/dictionary/templates/dictionary/affiliationtags.html
@@ -13,7 +13,7 @@
                <div class='aff tagAFF' style="background:{{aff.field_color}};border-color:{{aff.field_color}};">
                  <span class='affname'>{{aff.acronym}}</span>
                 {% get_obj_perms request.user for gloss.dataset as "dataset_perms" %}
-                {% if "change_permission" in dataset_perms %}
+                {% if "change_dataset" in dataset_perms %}
                  <span class='affcount'>
                      <a class='affdelete editform'
                         id='{{aff.id}}' value='{{aff.id}}' name='{{aff.acronym}}'
@@ -28,7 +28,7 @@
       {% endif %}
       {% endwith %}
     {% get_obj_perms request.user for gloss.dataset as "dataset_perms" %}
-    {% if "change_permission" in dataset_perms %}
+    {% if "change_dataset" in dataset_perms %}
       <div id="affcontainer"></div>
       <div class='editform'>
           <form id='affaddform'
diff --git a/signbank/dictionary/templates/dictionary/dataset_detail.html b/signbank/dictionary/templates/dictionary/dataset_detail.html
index b2adeee4e..3472b5015 100644
--- a/signbank/dictionary/templates/dictionary/dataset_detail.html
+++ b/signbank/dictionary/templates/dictionary/dataset_detail.html
@@ -57,7 +57,7 @@ <h3>{% trans "Dataset Details" %}</h3>
 
     <div class='pull-right'>
         {% get_obj_perms request.user for dataset as "dataset_perms" %}
-        {% if "change_permission" in dataset_perms %}
+        {% if "change_dataset" in dataset_perms %}
         {% if request.user|has_group:"Dataset_Manager" %}
          <span id='edit_message' style="padding-right: 1.8em;"></span>
          <button id='enable_edit' class='btn btn-default navbar-btn'>{% trans "Edit" %}</button>
@@ -91,7 +91,7 @@ <h3>{% trans "Dataset Details" %}</h3>
                     {% endif %}
                 {% endfor %}
                 {% get_obj_perms request.user for dataset as "dataset_perms" %}
-                {% if "change_permission" in dataset_perms %}
+                {% if "change_dataset" in dataset_perms %}
                 {% if request.user|has_group:"Dataset_Manager" %}
                     <form name='add_owner_form' id='add_owner_form' method='get'>
                         <table class='table table-condensed' style="background: transparent;">
diff --git a/signbank/dictionary/templates/dictionary/dataset_frequency.html b/signbank/dictionary/templates/dictionary/dataset_frequency.html
index a1ca3121e..51908913a 100644
--- a/signbank/dictionary/templates/dictionary/dataset_frequency.html
+++ b/signbank/dictionary/templates/dictionary/dataset_frequency.html
@@ -198,7 +198,7 @@ <h3>{% trans "Dataset Corpus Overview" %}</h3>
     </table>
         {% if dataset.get_metadata_path and dataset.uploaded_eafs %}
         {% get_obj_perms request.user for dataset as "dataset_perms" %}
-        {% if "change_permission" in dataset_perms %}
+        {% if "change_dataset" in dataset_perms %}
         {% if not corpus %}
         <form name='create_corpus_form' id='create_corpus_form' method='get'>
             <div class="hidden">
@@ -289,7 +289,7 @@ <h3>{% trans "Dataset Corpus Overview" %}</h3>
             <td>
             {% if request.user|has_group:"Dataset_Manager" %}
             {% get_obj_perms request.user for dataset as "dataset_perms" %}
-            {% if "change_permission" in dataset_perms %}
+            {% if "change_dataset" in dataset_perms %}
             <form name='process_speakers_form' id='process_speakers_form' method='get'>
                 <div class="hidden">
                     <input name='dataset_name' class='form-control form-control-light' value='{{dataset.acronym}}' >
@@ -325,7 +325,7 @@ <h3>{% trans "Dataset Corpus Overview" %}</h3>
                       <dd class="col-sm-2">
                            {% if request.user|has_group:"Dataset_Manager" %}
                            {% get_obj_perms request.user for dataset as "dataset_perms" %}
-                           {% if "change_permission" in dataset_perms %}
+                           {% if "change_dataset" in dataset_perms %}
                            {% csrf_token %}
                            <input type='hidden' name='sourceid' value='{{gloss.pk}}'>
                                     <div class='btn-group' >
@@ -382,7 +382,7 @@ <h3>{% trans "Dataset Corpus Overview" %}</h3>
                           <dt class="col-sm-6">{% trans "PATH" %}</dt>
                           {% if request.user|has_group:"Dataset_Manager" %}
                           {% get_obj_perms request.user for dataset as "dataset_perms" %}
-                          {% if "change_permission" in dataset_perms %}
+                          {% if "change_dataset" in dataset_perms %}
                           <dt class="col-sm-2">{% trans "DELETE" %}</dt>
                           {% endif %}
                           {% endif %}
@@ -405,7 +405,7 @@ <h3>{% trans "Dataset Corpus Overview" %}</h3>
                         <dd class="col-sm-6" >{{path}}</dd>
                            {% if request.user|has_group:"Dataset_Manager" %}
                            {% get_obj_perms request.user for dataset as "dataset_perms" %}
-                           {% if "change_permission" in dataset_perms %}
+                           {% if "change_dataset" in dataset_perms %}
                             <dd class="col-sm-2" id='{{dataset.acronym}}_{{document_identifier}}_{{path}}' value=''
                                 name="{{dataset.acronym}}_{{document_identifier}}_{{path}}">
                                     <input type="checkbox" name="select_document:{{path}}"
@@ -428,7 +428,7 @@ <h3>{% trans "Dataset Corpus Overview" %}</h3>
     {% if dataset.get_metadata_path and dataset.uploaded_eafs %}
     {% if request.user|has_group:"Dataset_Manager" %}
     {% get_obj_perms request.user for dataset as "dataset_perms" %}
-    {% if "change_permission" in dataset_perms %}
+    {% if "change_dataset" in dataset_perms %}
     <button id='remove_eafs_btn'
             {% if duplicates %}
             class='btn btn-danger'
@@ -488,7 +488,7 @@ <h3 id='modalRemoveEafs'>{% trans "Remove EAF Files" %}</h3>
     {% if dataset.get_metadata_path and dataset.uploaded_eafs %}
     {% if request.user|has_group:"Dataset_Manager" %}
     {% get_obj_perms request.user for dataset as "dataset_perms" %}
-    {% if "change_permission" in dataset_perms %}
+    {% if "change_dataset" in dataset_perms %}
     <button id='refresh_all_btn' class='btn btn-primary' data-toggle='modal' data-target='#refresh_all_modal'>{% trans "Refresh All Documents" %}</button>
 
     <div class="modal fade" id="refresh_all_modal" tabindex="-1" role="dialog" aria-labelledby="#modalRefreshAll" aria-hidden="true">
diff --git a/signbank/dictionary/templates/dictionary/edit_annotated_sentence.html b/signbank/dictionary/templates/dictionary/edit_annotated_sentence.html
index 7d7b191b3..bb800bc80 100644
--- a/signbank/dictionary/templates/dictionary/edit_annotated_sentence.html
+++ b/signbank/dictionary/templates/dictionary/edit_annotated_sentence.html
@@ -10,7 +10,7 @@
 {% block content %}
 
 {% get_obj_perms request.user for gloss.lemma.dataset as "dataset_perms" %}
-{% if "change_permission" in dataset_perms %}
+{% if "change_dataset" in dataset_perms %}
 <div class='editform', style="width:1000px">
     <fieldset>
         <legend>{% trans "Edit Annotated Sentence" %}</legend>
diff --git a/signbank/dictionary/templates/dictionary/gloss_detail.html b/signbank/dictionary/templates/dictionary/gloss_detail.html
index 8fe32e7b3..1c1d245c4 100755
--- a/signbank/dictionary/templates/dictionary/gloss_detail.html
+++ b/signbank/dictionary/templates/dictionary/gloss_detail.html
@@ -512,7 +512,7 @@ <h3 id='modalQuery'>
     </ul>
     </div>
     
-    {% if "change_permission" in dataset_perms %}
+    {% if "change_dataset" in dataset_perms %}
     <div class='pull-right' style="margin-right:15px;margin-top:10px;">
 
          <span id='edit_message' style="padding-right: 1.8em;"></span>
@@ -549,7 +549,7 @@ <h2 id='modalGlossCopy'>{% trans "Copy Gloss" %}</h2>
                              <td><span>
                                  {% for s_dataset in selected_datasets %}
                                  {% get_obj_perms request.user for s_dataset as "dataset_perms" %}
-                                 {% if "change_permission" in dataset_perms %}
+                                 {% if "change_dataset" in dataset_perms %}
                                  {% if gloss.lemma.dataset == s_dataset or last_used_dataset == s_dataset.acronym %}
                                 <input type="radio" name="dataset"
                                        id="dataset_{{s_dataset.id}}" value="{{s_dataset.id}}" checked>
@@ -631,7 +631,7 @@ <h4>{{annotation}}</h4>
                              <td><span>
                                  {% for s_dataset in selected_datasets %}
                                  {% get_obj_perms request.user for s_dataset as "dataset_perms" %}
-                                 {% if "change_permission" in dataset_perms %}
+                                 {% if "change_dataset" in dataset_perms %}
                                  {% if gloss.lemma.dataset == s_dataset or last_used_dataset == s_dataset.acronym %}
                                 <input type="radio" name="dataset"
                                        id="dataset_{{s_dataset.id}}" value="{{s_dataset.id}}" checked>
@@ -663,7 +663,7 @@ <h4>{{annotation}}</h4>
 
 </div>
 
-        {% if "change_permission" in dataset_perms %}
+        {% if "change_dataset" in dataset_perms %}
         <div class="modal fade" id="delete_gloss_modal" tabindex="-1" role="dialog" aria-labelledby="#modalTitleDelete" aria-hidden="true">
              <div class="modal-dialog modal-lg left-modal">
                 <div class="modal-content">
@@ -735,7 +735,7 @@ <h4>{% trans "Sign" %}: {{annotation}}</h4>
         {% endif %}
     </div>
 
-    {% if "change_permission" in dataset_perms %}
+    {% if "change_dataset" in dataset_perms %}
     <div class='editform'>
         <fieldset>
             <h4>{% trans "Upload New Video" %}</h4>
@@ -859,7 +859,7 @@ <h4>{% trans "Upload New Citation Form Image" %}</h4>
     </div>
     {% endif %}
 
-    {% if gloss.has_video and "change_permission" in dataset_perms %}
+    {% if gloss.has_video and "change_dataset" in dataset_perms %}
         <div class="editform">
             <h4>{% trans "Create Citation Form Image from Current Video" %}</h4>
             <a href="{% url 'dictionary:create_citation_image'  gloss.id %}" class="btn btn-primary">Create</a>
@@ -867,7 +867,7 @@ <h4>{% trans "Create Citation Form Image from Current Video" %}</h4>
 
     {% endif %}
 
-    {% if "change_permission" in dataset_perms %}
+    {% if "change_dataset" in dataset_perms %}
     <div class="editform">
         <fieldset>
          <h4>{% trans "Delete Media" %}</h4>
@@ -885,7 +885,7 @@ <h4>{% trans "Delete Media" %}</h4>
     </div>
     {% endif %}
 
-     {% if "change_permission" in dataset_perms %}
+     {% if "change_dataset" in dataset_perms %}
     <div class="editform">
         <fieldset>
          <h4>{% trans "Delete Sign" %}</h4>
@@ -1020,7 +1020,7 @@ <h4>{% trans "Delete Sign" %}</h4>
                     <table class='table table-condensed' style="table-layout: fixed">
                         {% for sense in senses %}
                             <tr>
-                                {% if "change_permission" in dataset_perms %}
+                                {% if "change_dataset" in dataset_perms %}
                                 <td style="width:20px">
                                         {% if not forloop.first %}  
                                         <span class='sense-icon'><a href='{% url "dictionary:sort_sense" gloss.id forloop.counter "up" %}' style="color:red;">&#x25B2;</a></span>
@@ -1043,7 +1043,7 @@ <h4>{% trans "Delete Sign" %}</h4>
                                     {% endif %}<br><br>
                                 </td>
                                 <td style="width:50px">
-                                    {% if "change_permission" in dataset_perms %}
+                                    {% if "change_dataset" in dataset_perms %}
                                         <span class='glyphicon glyphicon-trash sense_delete sense-icon pull-right' style="color:red"  data-toggle='modal' data-target='#delete_sense_modal_{{sense.id}}'></span>
                                         <div class="modal fade modal-sense" id="delete_sense_modal_{{sense.id}}" role="dialog" aria-labelledby="#modalTitleDeleteSense" aria-hidden="true">
                                             <div class="modal-dialog modal-lg left-modal">
@@ -1183,7 +1183,7 @@ <h2 id='modalTitleSimilarSense'>{% trans "Similar senses" %}</h2>
                                     <table class='table table-condensed' style="table-layout: fixed">
                                         {% for examplesentence in sense.ordered_examplesentences %}
                                             <tr>
-                                                {% if "change_permission" in dataset_perms %}
+                                                {% if "change_dataset" in dataset_perms %}
                                                 <td style="width:20px">
                                                     {% if not forloop.first %}  
                                                     <span class='sense-icon'><a href='{% url "dictionary:sort_examplesentence" sense.id gloss.id forloop.counter "up" %}' style="color:red;">&#x25B2;</a></span>
@@ -1211,7 +1211,7 @@ <h2 id='modalTitleSimilarSense'>{% trans "Similar senses" %}</h2>
                                                     {% if examplesentence.has_video %}
                                                         <span class="pull-right"><img data-target="#exampleVidModal_{{examplesentence.id}}" data-toggle="modal" src='{{STATIC_URL}}images/playvideo.png' style="width:25px; height:25px; margin: 0px; cursor: pointer;"></span>
                                                     {% endif %}
-                                                    {% if "change_permission" in dataset_perms %}
+                                                    {% if "change_dataset" in dataset_perms %}
                                                         <span class = "sense-icon pull-right"><a href='{% url "dictionary:add_sentence_video" glossid=gloss.id examplesentenceid=examplesentence.id %}'><img src='{{STATIC_URL}}images/addvideo.png' style="width:25px; height:25px; margin: 0px; cursor: pointer;"></a></span>
                                                         {% if examplesentence.has_video %}
                                                             <span class="sense-icon pull-right">
@@ -1311,7 +1311,7 @@ <h2 id='modalTitleEditExamplestc'>{% trans "Edit an example sentence" %}</h2>
                                                 </div> 
                                             </div>
                                         {% endfor %}  
-                                        {% if "change_permission" in dataset_perms %}
+                                        {% if "change_dataset" in dataset_perms %}
                                             <tr class="sense-icon">
                                                 <td>
                                                     <button data-toggle='modal' data-target='#add_examplestc_modal_{{sense.id}}', class='sense-button btn btn-primary btn-space'>{% trans "Add an example sentence" %}</button>
@@ -1355,7 +1355,7 @@ <h2 id='modalTitleAddExamplestc'>{% trans "Add an example sentence" %}</h2>
                                 </td>
                             </tr>
                         {% endfor %}
-                        {% if "change_permission" in dataset_perms %}
+                        {% if "change_dataset" in dataset_perms %}
                             <tr class="sense-icon">
                                 <td>
                                     <button data-toggle='modal' data-target='#add_sense_modal_{{gloss.id}}', class='sense-button btn btn-primary btn-space sense-button sense_add'>{% trans "Add a sense" %}</button>
@@ -1493,7 +1493,7 @@ <h2 id='modalDeleteNME'>{% trans "Delete NME Video" %}</h2>
             {% endif %}
             </div>
 
-            {% if "change_permission" in dataset_perms %}
+            {% if "change_dataset" in dataset_perms %}
             <div class='editform' style="width:800px;height:800px;">
                 <fieldset>
                     <h4>{% trans "Upload New NME Video" %}</h4>
@@ -1562,7 +1562,7 @@ <h4>{% trans "Upload New NME Video" %}</h4>
                    {% for morphdef, translated_role, sign_display in morphdefs %}
 
                    <tr>
-                       {% if "change_permission" in dataset_perms %}
+                       {% if "change_dataset" in dataset_perms %}
                          <td style='width:2em;'>
                             <span class='glyphicon glyphicon-trash morphology-definition-delete' data-toggle='modal' data-target='#delete_morphology-definition_modal_{{morphdef.id}}'></span>
 
@@ -1604,7 +1604,7 @@ <h2 id='modalTitleComp'>{% trans "Delete This Compound Part" %}</h2>
            </tbody>
            </table>
 
-            {% if "change_permission" in dataset_perms %}
+            {% if "change_dataset" in dataset_perms %}
             <form name="add_morphologydefinition_form" id='add_morphologydefinition_form'
                   onsubmit='return validateForm("add_morphologydefinition_form","morpheme_id","parent_gloss_id",
                                                 "Please choose a gloss for Add Component Morphology.",
@@ -1653,7 +1653,7 @@ <h2 id='modalTitleComp'>{% trans "Delete This Compound Part" %}</h2>
                 {% for morpheme, morph_display, morpheme_type in simultaneous_morphology %}
                 <tr>
                     <!-- Facility to delete this morpheme -->
-                    {% if "change_permission" in dataset_perms %}
+                    {% if "change_dataset" in dataset_perms %}
                      <td>
                         <span class='glyphicon glyphicon-trash morpheme-definition-delete' data-toggle='modal' data-target='#delete_morpheme-definition_modal_{{morpheme.pk}}'></span>
 
@@ -1692,7 +1692,7 @@ <h2 id='modalTitleMrp'>{% trans "Delete This Morpheme" %}</h2>
             </table>
 
             <!-- Facilitate adding and deleting morphemes that are used in this sign -->
-            {% if "change_permission" in dataset_perms %}
+            {% if "change_dataset" in dataset_perms %}
             {% if count_morphemes_in_dataset %}
             <form name='add_morphemedefinition_form' id='add_morphemedefinition_form'
                   onsubmit='return validateForm("add_morphemedefinition_form","morph_id","host_gloss_id",
@@ -1730,7 +1730,7 @@ <h2 id='modalTitleMrp'>{% trans "Delete This Morpheme" %}</h2>
                 {% for blend, blend_display in blend_morphology %}
                 <tr>
                     <!-- Facility to delete this blend -->
-                    {% if "change_permission" in dataset_perms %}
+                    {% if "change_dataset" in dataset_perms %}
                      <td>
                         <span class='glyphicon glyphicon-trash blend-definition-delete' data-toggle='modal'
                               data-target='#delete_blend-definition_modal_{{blend.pk}}'></span>
@@ -1771,7 +1771,7 @@ <h2 id='modalTitleBlend'>{% trans "Delete This Blend" %}</h2>
             </table>
 
             <!-- Facilitate adding and deleting blends that are used in this sign -->
-            {% if "change_permission" in dataset_perms %}
+            {% if "change_dataset" in dataset_perms %}
             <form name='add_blenddefinition_form' id='add_blenddefinition_form'
                   onsubmit='return validateForm("add_blenddefinition_form","blend_id","host_gloss_id",
                                                 "Please choose a gloss for Add Blend Morphology.",
@@ -2077,7 +2077,7 @@ <h2 id='modalTitleBlend'>{% trans "Delete This Blend" %}</h2>
            <table class='table table-condensed' style="z-index:1000;">
                {% for rel, target_display in otherrelations %}
                <tr id='row_{{rel.id}}'>
-               {% if "change_permission" in dataset_perms %}
+               {% if "change_dataset" in dataset_perms %}
 
                      <td style='width:2em;'>
                         <span class='glyphicon glyphicon-trash relation_delete' data-toggle='modal' data-target='#delete_relation_modal_{{rel.id}}'></span>
@@ -2119,7 +2119,7 @@ <h2 id='modalTitleRel'>{% trans "Delete This Relation" %}</h2>
                {% endfor %}
            </table>
 
-           {% if "change_permission" in dataset_perms %}
+           {% if "change_dataset" in dataset_perms %}
            <form name='add_relation_form' id='add_relation_form'
                  onsubmit='return validateForm("add_relation_form","targetid","sourceid",
                                                 "Please choose a target gloss for Add Relation to Other Sign.",
@@ -2167,7 +2167,7 @@ <h2 id='modalTitleRel'>{% trans "Delete This Relation" %}</h2>
 		            </tr>
                    {% for rel in gloss.relationtoforeignsign_set.all %}
                     <tr id='foreign_{{rel.id}}'>
-                    {% if "change_permission" in dataset_perms %}
+                    {% if "change_dataset" in dataset_perms %}
 
                      <td style='width:1em;'>
                         <span class='glyphicon glyphicon-trash relationtoforeignsign_delete' data-toggle='modal' data-target='#delete_foreignrelation_modal_{{rel.id}}'></span>
@@ -2208,7 +2208,7 @@ <h2 id='modalTitleForeign'>{% trans "Delete This Relation" %}</h2>
                    {% endfor %}
                </table>
 
-               {% if "change_permission" in dataset_perms %}
+               {% if "change_dataset" in dataset_perms %}
                <form id='add_relationtoforeignsign_form' method='post' action='{% url "dictionary:add_relationtoforeignsign" %}'>
                    {% csrf_token %}
                    <input type='hidden' name='sourceid' value='{{gloss.pk}}'>
@@ -2295,7 +2295,7 @@ <h2 id='modalTitleForeign'>{% trans "Delete This Relation" %}</h2>
               <tr>
                 <td>
 
-                   {% if "change_permission" in dataset_perms %}
+                   {% if "change_dataset" in dataset_perms %}
                     {% if not def.published and perms.dictionary.can_delete_unpublished or def.published and perms.dictionary.can_delete_published %}
                     <span class='glyphicon glyphicon-trash definition_delete' data-toggle='modal' data-target='#delete_definition_modal_{{def.id}}'></span>
 
@@ -2336,7 +2336,7 @@ <h2 id='modalTitleNote'>{% trans "Delete This Note" %}</h2>
             {% endfor %}
             </table>
 
-           {% if "change_permission" in dataset_perms %}
+           {% if "change_dataset" in dataset_perms %}
             <form id='add_definition' action='{% url "dictionary:add_definition" gloss.id %}' method="POST">
                 <fieldset>
                 {% csrf_token %}
@@ -2491,7 +2491,7 @@ <h2 id='modalTitleDeleteAnnotatedSentence'>{% trans "Delete this annotated sente
 
                {% for media_okay,pk,path,file_type,type,alternative_gloss,file_name in other_media %}
                <tr>
-                   {% if "change_permission" in dataset_perms %}
+                   {% if "change_dataset" in dataset_perms %}
                      <td>
                         <span class='glyphicon glyphicon-trash other-video-delete' data-toggle='modal' data-target='#delete_other_media_{{pk}}'></span>
 
@@ -2536,7 +2536,7 @@ <h2 id='modalTitleMedia'>{% trans "Delete This Media" %}</h2>
 
            </table>
 
-           {% if "change_permission" in dataset_perms %}
+           {% if "change_dataset" in dataset_perms %}
             <form id='add_other_media' action='{% url "dictionary:add_othermedia" %}' method="POST" enctype="multipart/form-data">
 
                <input type='hidden' name='gloss' value='{{gloss.pk}}'>
diff --git a/signbank/dictionary/templates/dictionary/glosstags.html b/signbank/dictionary/templates/dictionary/glosstags.html
index 6e8e95cee..558308cd8 100755
--- a/signbank/dictionary/templates/dictionary/glosstags.html
+++ b/signbank/dictionary/templates/dictionary/glosstags.html
@@ -14,7 +14,7 @@
                    {% load underscore_to_space %}
                  <span class='tagname'>{{tag.name|underscore_to_space}}</span>
                 {% get_obj_perms request.user for gloss.dataset as "dataset_perms" %}
-                {% if "change_permission" in dataset_perms %}
+                {% if "change_dataset" in dataset_perms %}
                  <span class='tagcount'>
                      <a class='tagdelete editform'
                         id='{{tag.name}}' value={{tag.id}} name='{{tag.name}}'
@@ -28,7 +28,7 @@
           </ul>
       {% endif %}
     {% get_obj_perms request.user for gloss.dataset as "dataset_perms" %}
-    {% if "change_permission" in dataset_perms %}
+    {% if "change_dataset" in dataset_perms %}
       <div id="tagcontainer"></div>
       <div class='editform'>
           <form id='tagaddform' 
diff --git a/signbank/dictionary/templates/dictionary/morpheme_detail.html b/signbank/dictionary/templates/dictionary/morpheme_detail.html
index 05e4669dd..80e12aba9 100755
--- a/signbank/dictionary/templates/dictionary/morpheme_detail.html
+++ b/signbank/dictionary/templates/dictionary/morpheme_detail.html
@@ -294,7 +294,7 @@
     </ul>
     </div>
     {% get_obj_perms request.user for morpheme.lemma.dataset as "dataset_perms" %}
-    {% if "change_permission" in dataset_perms %}
+    {% if "change_dataset" in dataset_perms %}
     {% if perms.dictionary.change_morpheme %}
     <div class='pull-right' style="margin-right:15px;margin-top:10px;z-index:100;">
 
@@ -392,7 +392,7 @@ <h4>{% trans "Upload New Citation Form Image" %}</h4>
     </div>
     {% endif %}
 
-    {% if "change_permission" in dataset_perms %}
+    {% if "change_dataset" in dataset_perms %}
     {% if perms.dictionary.change_morpheme %}
     <div class="editform">
         <fieldset>
@@ -778,7 +778,7 @@ <h2 id='modalTitle'>{% trans "Delete This Note" %}</h2>
                {% for media_okay,pk,path,file_type,type,alternative_gloss,file_name in other_media %}
                <tr>
                    {% get_obj_perms request.user for morpheme.lemma.dataset as "dataset_perms" %}
-                   {% if "change_permission" in dataset_perms %}
+                   {% if "change_dataset" in dataset_perms %}
                      <td>
                         <span class='glyphicon glyphicon-trash other-video-delete' data-toggle='modal' data-target='#delete_other_media_{{pk}}'></span>
 
diff --git a/signbank/dictionary/templates/dictionary/morphemetags.html b/signbank/dictionary/templates/dictionary/morphemetags.html
index a2fb3a7e0..15d173b9b 100644
--- a/signbank/dictionary/templates/dictionary/morphemetags.html
+++ b/signbank/dictionary/templates/dictionary/morphemetags.html
@@ -14,7 +14,7 @@
                    {% load underscore_to_space %}
                  <span class='tagname'>{{tag.name|underscore_to_space}}</span>
                  {% get_obj_perms request.user for morpheme.dataset as "dataset_perms" %}
-                 {% if "change_permission" in dataset_perms %}
+                 {% if "change_dataset" in dataset_perms %}
                  <span class='tagcount'>
                      <a class='tagdelete editform'
                         id='{{tag.name}}'
@@ -28,7 +28,7 @@
           </ul>
       {% endif %}
       {% get_obj_perms request.user for morpheme.dataset as "dataset_perms" %}
-      {% if "change_permission" in dataset_perms %}
+      {% if "change_dataset" in dataset_perms %}
       <div id="tagcontainer"></div>
       <div class='editform'>
           <form id='tagaddform' 
diff --git a/signbank/dictionary/update.py b/signbank/dictionary/update.py
index 5a794c1e4..c4adafc1c 100755
--- a/signbank/dictionary/update.py
+++ b/signbank/dictionary/update.py
@@ -839,7 +839,7 @@ def update_gloss(request, glossid):
 
             return HttpResponse(str(newvalue), {'content-type': 'text/plain'})
 
-        if ds in guardian.shortcuts.get_objects_for_user(request.user, ['view_permission'],
+        if ds in guardian.shortcuts.get_objects_for_user(request.user, ['view_dataset'],
                                                          Dataset, any_perm=True):
             newvalue = value
             setattr(gloss, field, ds)
@@ -2489,7 +2489,7 @@ def update_morpheme(request, morphemeid):
 
             return HttpResponse(str(newvalue), {'content-type': 'text/plain'})
 
-        if ds in guardian.shortcuts.get_objects_for_user(request.user, ['view_permission'],
+        if ds in guardian.shortcuts.get_objects_for_user(request.user, ['view_dataset'],
                                                          Dataset, any_perm=True):
             newvalue = value
             setattr(morpheme, field, ds)
@@ -2925,7 +2925,7 @@ def update_dataset(request, datasetid):
                                  _('You must be in group Dataset Manager to modify dataset details.'))
             return HttpResponseForbidden("Dataset Update Not Allowed")
 
-        user_change_datasets = guardian.shortcuts.get_objects_for_user(request.user, 'change_permission', Dataset, accept_global_perms=False)
+        user_change_datasets = guardian.shortcuts.get_objects_for_user(request.user, 'change_dataset', Dataset, accept_global_perms=False)
         if dataset not in user_change_datasets:
             return HttpResponseForbidden("Dataset Update Not Allowed")
 
@@ -3043,7 +3043,7 @@ def update_excluded_choices(request):
     selected_datasets = get_selected_datasets_for_user(request.user)
 
     managed_datasets = []
-    change_dataset_permission = get_objects_for_user(request.user, 'change_permission', Dataset)
+    change_dataset_permission = get_objects_for_user(request.user, 'change_dataset', Dataset)
     for dataset in selected_datasets:
         if dataset in change_dataset_permission:
             managed_datasets.append(dataset)
@@ -3192,8 +3192,8 @@ def remove_eaf_files(request):
         messages.add_message(request, messages.ERROR, _('Dataset does not exist.'))
         return HttpResponseRedirect(reverse('admin_dataset_view'))
 
-    # Check for 'change_permission' permission
-    user_change_datasets = get_objects_for_user(request.user, 'change_permission', Dataset, accept_global_perms=False)
+    # Check for 'change_dataset' permission
+    user_change_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset, accept_global_perms=False)
     if not user_change_datasets.exists() or dataset not in user_change_datasets:
         messages.add_message(request, messages.ERROR, _("You are not authorized to remove eaf files."))
         return HttpResponseRedirect(request.META.get('HTTP_REFERER'))
@@ -3243,8 +3243,8 @@ def upload_eaf_files(request):
             messages.add_message(request, messages.ERROR, _('Dataset does not exist.'))
             return HttpResponseRedirect(reverse('admin_dataset_manager'))
 
-        # Check for 'change_permission' permission
-        user_change_datasets = get_objects_for_user(request.user, 'change_permission', Dataset, accept_global_perms=False)
+        # Check for 'change_dataset' permission
+        user_change_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset, accept_global_perms=False)
         if not user_change_datasets.exists() or dataset not in user_change_datasets:
             messages.add_message(request, messages.ERROR, _("You are not authorized to upload eaf files."))
             return HttpResponseRedirect(request.META.get('HTTP_REFERER'))
@@ -3499,7 +3499,7 @@ def assign_lemma_dataset_to_gloss(request, glossid):
 
     if not request.user.is_superuser:
         # check that user can write to the dataset
-        datasets_user_can_change = get_objects_for_user(request.user, 'change_permission', Dataset)
+        datasets_user_can_change = get_objects_for_user(request.user, 'change_dataset', Dataset)
         if dataset_of_dummy not in datasets_user_can_change:
             failure_message = _('You do not have change permission for') + ' ' + dummy_lemma.dataset.name
             return HttpResponse(json.dumps({'glossid': str(glossid),
@@ -3524,7 +3524,7 @@ def okay_to_update_gloss(request, gloss):
     if not gloss or not gloss.lemma:
         return False
 
-    if gloss.lemma.dataset not in guardian.shortcuts.get_objects_for_user(request.user, ['change_permission'],
+    if gloss.lemma.dataset not in guardian.shortcuts.get_objects_for_user(request.user, ['change_dataset'],
                                                                           Dataset, any_perm=True):
         return False
     
diff --git a/signbank/dictionary/views.py b/signbank/dictionary/views.py
index ab733f986..3127fe5c6 100644
--- a/signbank/dictionary/views.py
+++ b/signbank/dictionary/views.py
@@ -544,7 +544,7 @@ def add_new_morpheme(request):
 def import_csv_create(request):
     user = request.user
     import guardian
-    user_datasets = guardian.shortcuts.get_objects_for_user(user, 'change_permission', Dataset)
+    user_datasets = guardian.shortcuts.get_objects_for_user(user, 'change_dataset', Dataset)
     user_datasets_names = [dataset.acronym for dataset in user_datasets]
 
     selected_datasets = get_selected_datasets_for_user(user)
@@ -951,7 +951,7 @@ def import_csv_create(request):
 def import_csv_update(request):
     user = request.user
     import guardian
-    user_datasets = guardian.shortcuts.get_objects_for_user(user, 'change_permission', Dataset)
+    user_datasets = guardian.shortcuts.get_objects_for_user(user, 'change_dataset', Dataset)
     user_datasets_names = [dataset.acronym for dataset in user_datasets]
 
     selected_datasets = get_selected_datasets_for_user(user)
@@ -1508,7 +1508,7 @@ def import_csv_update(request):
 def import_csv_lemmas(request):
     user = request.user
     import guardian
-    user_datasets = guardian.shortcuts.get_objects_for_user(user, 'change_permission', Dataset)
+    user_datasets = guardian.shortcuts.get_objects_for_user(user, 'change_dataset', Dataset)
     user_datasets_names = [dataset.acronym for dataset in user_datasets]
 
     selected_datasets = get_selected_datasets_for_user(user)
@@ -2296,7 +2296,7 @@ def package(request):
 @put_api_user_in_request
 def info(request):
     import guardian
-    user_datasets = guardian.shortcuts.get_objects_for_user(request.user, 'change_permission', Dataset)
+    user_datasets = guardian.shortcuts.get_objects_for_user(request.user, 'change_dataset', Dataset)
     user_datasets_names = [dataset.acronym for dataset in user_datasets]
 
     # Put the default dataset in first position
@@ -2803,7 +2803,7 @@ def gloss_api_get_sign_name_and_media_info(request):
 def import_csv_create_sentences(request):
     user = request.user
     import guardian
-    user_datasets = guardian.shortcuts.get_objects_for_user(user, 'change_permission', Dataset)
+    user_datasets = guardian.shortcuts.get_objects_for_user(user, 'change_dataset', Dataset)
     user_datasets_names = [dataset.acronym for dataset in user_datasets]
 
     selected_datasets = get_selected_datasets_for_user(user)
diff --git a/signbank/gloss_morphology_update.py b/signbank/gloss_morphology_update.py
index e24af7fc2..4bc1a64f3 100644
--- a/signbank/gloss_morphology_update.py
+++ b/signbank/gloss_morphology_update.py
@@ -172,7 +172,7 @@ def api_update_gloss_morphology(request, datasetid, glossid):
         results['updatestatus'] = "Failed"
         return JsonResponse(results)
 
-    change_permit_datasets = get_objects_for_user(request.user, 'change_permission', Dataset)
+    change_permit_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset)
     if dataset not in change_permit_datasets:
         errors[gettext("Dataset")] = gettext("No change permission for dataset.")
         results['errors'] = errors
diff --git a/signbank/gloss_update.py b/signbank/gloss_update.py
index a7f3bcebe..23df03adc 100644
--- a/signbank/gloss_update.py
+++ b/signbank/gloss_update.py
@@ -553,7 +553,7 @@ def api_update_gloss(request, datasetid, glossid):
         results['updatestatus'] = "Failed"
         return JsonResponse(results)
 
-    change_permit_datasets = get_objects_for_user(request.user, 'change_permission', Dataset)
+    change_permit_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset)
     if dataset not in change_permit_datasets:
         errors[gettext("Dataset")] = gettext("No change permission for dataset.")
         results['errors'] = errors
@@ -689,7 +689,7 @@ def api_delete_gloss(request, datasetid, glossid):
         results['updatestatus'] = "Failed"
         return JsonResponse(results)
 
-    change_permit_datasets = get_objects_for_user(request.user, 'change_permission', Dataset)
+    change_permit_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset)
     if dataset not in change_permit_datasets:
         errors[gettext("Dataset")] = gettext("No change permission for dataset.")
         results['errors'] = errors
@@ -769,7 +769,7 @@ def api_restore_gloss(request, datasetid, glossid):
         results['updatestatus'] = "Failed"
         return JsonResponse(results)
 
-    change_permit_datasets = get_objects_for_user(request.user, 'change_permission', Dataset)
+    change_permit_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset)
     if dataset not in change_permit_datasets:
         errors[gettext("Dataset")] = gettext("No change permission for dataset.")
         results['errors'] = errors
@@ -943,7 +943,7 @@ def api_update_gloss_nmevideo(request, datasetid, glossid, videoid):
         results['updatestatus'] = "Failed"
         return JsonResponse(results)
 
-    change_permit_datasets = get_objects_for_user(request.user, 'change_permission', Dataset)
+    change_permit_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset)
     if dataset not in change_permit_datasets:
         errors[gettext("Dataset")] = gettext("No change permission for dataset.")
         results['errors'] = errors
@@ -1086,7 +1086,7 @@ def api_create_gloss_nmevideo(request, datasetid, glossid):
         results['updatestatus'] = "Failed"
         return JsonResponse(results)
 
-    change_permit_datasets = get_objects_for_user(request.user, 'change_permission', Dataset)
+    change_permit_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset)
     if dataset not in change_permit_datasets:
         errors[gettext("Dataset")] = gettext("No change permission for dataset.")
         results['errors'] = errors
@@ -1170,7 +1170,7 @@ def api_delete_gloss_nmevideo(request, datasetid, glossid, videoid):
         results['updatestatus'] = "Failed"
         return JsonResponse(results)
 
-    change_permit_datasets = get_objects_for_user(request.user, 'change_permission', Dataset)
+    change_permit_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset)
     if dataset not in change_permit_datasets:
         errors[gettext("Dataset")] = gettext("No change permission for dataset.")
         results['errors'] = errors
diff --git a/signbank/manage_videos.py b/signbank/manage_videos.py
index 21b0abef2..41e8591f4 100644
--- a/signbank/manage_videos.py
+++ b/signbank/manage_videos.py
@@ -72,7 +72,7 @@ def upload_zipped_videos_folder(request):
 
     # make sure the user can write to this dataset
     from guardian.shortcuts import get_objects_for_user
-    user_change_datasets = get_objects_for_user(request.user, 'change_permission', Dataset,
+    user_change_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset,
                                                 accept_global_perms=False)
     if not user_change_datasets or dataset not in user_change_datasets:
         messages.add_message(request, messages.ERROR, _('No change dataset permission.'))
@@ -258,7 +258,7 @@ def import_video_to_gloss_json(request):
 
     # make sure the user can write to this dataset
     from guardian.shortcuts import get_objects_for_user
-    user_change_datasets = get_objects_for_user(request.user, 'change_permission', Dataset,
+    user_change_datasets = get_objects_for_user(request.user, 'change_dataset', Dataset,
                                                 accept_global_perms=False)
     if not user_change_datasets or dataset not in user_change_datasets:
         return JsonResponse({})
diff --git a/signbank/registration/views.py b/signbank/registration/views.py
index f2de36fdd..faaf821d9 100755
--- a/signbank/registration/views.py
+++ b/signbank/registration/views.py
@@ -345,11 +345,11 @@ def user_profile(request):
     view_permit_datasets = []
     for dataset in Dataset.objects.all():
         permissions_for_dataset = get_user_perms(request.user, dataset)
-        if 'view_permission' in permissions_for_dataset:
+        if 'view_dataset' in permissions_for_dataset:
             view_permit_datasets.append(dataset)
     change_permit_datasets = []
     for dataset_user_can_view in view_permit_datasets:
-        if 'change_permission' in get_user_perms(request.user, dataset_user_can_view):
+        if 'change_dataset' in get_user_perms(request.user, dataset_user_can_view):
             change_permit_datasets.append(dataset_user_can_view)
     user_has_queries = SearchHistory.objects.filter(user=request.user).count()
     user_can_change_glosses = len(change_permit_datasets) > 0
diff --git a/signbank/tools.py b/signbank/tools.py
index 26b3a5dc3..e3cd886d3 100755
--- a/signbank/tools.py
+++ b/signbank/tools.py
@@ -1722,7 +1722,7 @@ def get_users_without_dataset():
     users_with_no_dataset = []
 
     for user in User.objects.all():
-        if user.is_active and len(get_objects_for_user(user, ['view_permission'], Dataset, any_perm=True)) == 0:
+        if user.is_active and len(get_objects_for_user(user, ['view_dataset'], Dataset, any_perm=True)) == 0:
             users_with_no_dataset.append(user)
 
     return users_with_no_dataset

From 2595fd95ffc47a43f0aa846fc801857f3fd76b77 Mon Sep 17 00:00:00 2001
From: susanodd <mijnoog@kpnmail.nl>
Date: Wed, 28 Aug 2024 16:09:13 +0200
Subject: [PATCH 07/11] #1270: Fixed stragglers.

---
 signbank/dictionary/models.py | 4 ++--
 signbank/dictionary/tests.py  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/signbank/dictionary/models.py b/signbank/dictionary/models.py
index 9f5239130..94e2d6645 100755
--- a/signbank/dictionary/models.py
+++ b/signbank/dictionary/models.py
@@ -3193,7 +3193,7 @@ def get_users_who_can_view_dataset(self):
                                                        with_group_users=False)
         for user in all_users:
             if user in users_who_can_access_me.keys():
-                if 'view_permission' in users_who_can_access_me[user]:
+                if 'view_dataset' in users_who_can_access_me[user]:
                     users_who_can_view_dataset.append(user)
 
         return users_who_can_view_dataset
@@ -3208,7 +3208,7 @@ def get_users_who_can_change_dataset(self):
                                                        with_group_users=False)
         for user in all_users:
             if user in users_who_can_access_me.keys():
-                if 'change_permission' in users_who_can_access_me[user]:
+                if 'change_dataset' in users_who_can_access_me[user]:
                     users_who_can_change_dataset.append(user)
 
         return users_who_can_change_dataset
diff --git a/signbank/dictionary/tests.py b/signbank/dictionary/tests.py
index 06b2be41e..0d343415d 100644
--- a/signbank/dictionary/tests.py
+++ b/signbank/dictionary/tests.py
@@ -513,7 +513,7 @@ def test_DatasetListView_ECV_export_empty_dataset(self):
 
     def test_DatasetListView_ECV_export_permission_change_dataset(self):
 
-        print('Test DatasetListView export_ecv with permission change_permission')
+        print('Test DatasetListView export_ecv with permission change_dataset')
         print('Test Dataset is: ', self.test_dataset.acronym)
 
         location_ecv_files = ECV_FOLDER

From 5832b28b8bd51aa92d816efe9d8c60d30c5a4550 Mon Sep 17 00:00:00 2001
From: susanodd <mijnoog@kpnmail.nl>
Date: Mon, 2 Sep 2024 15:30:28 +0200
Subject: [PATCH 08/11] #1270: Reset rest of altered permissions, made to match
 master again.

---
 signbank/dictionary/adminviews.py |  4 +++-
 signbank/dictionary/tests.py      | 30 +++++++++++++++---------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/signbank/dictionary/adminviews.py b/signbank/dictionary/adminviews.py
index b2d7b4c92..d139b311c 100755
--- a/signbank/dictionary/adminviews.py
+++ b/signbank/dictionary/adminviews.py
@@ -3738,6 +3738,7 @@ def get_queryset(self):
             datasets_with_public_glosses = get_datasets_with_public_glosses()
             viewable_datasets = list(
                 set([ds.id for ds in datasets_with_public_glosses]))
+
             qs = Dataset.objects.filter(id__in=viewable_datasets)
             datasets_to_choose_from = qs.annotate(checked=ExpressionWrapper(Q(id__in=selected_dataset_ids),
                                                                             output_field=BooleanField())).order_by('acronym')
@@ -3918,6 +3919,7 @@ def render_to_add_user_response(self, context):
 
         if 'add_view_perm' in self.request.GET:
             manage_identifier += '_manage_view'
+
             if dataset_object in datasets_user_can_view:
                 if user_object.is_staff or user_object.is_superuser:
                     messages.add_message(self.request, messages.INFO,
@@ -3985,7 +3987,7 @@ def render_to_add_user_response(self, context):
                 manage_identifier += '_manage_view'
                 return HttpResponseRedirect(reverse('admin_dataset_manager') + '?' + manage_identifier)
             try:
-                assign_perm('dictionary.change_dataset', user_object, dataset_object)
+                assign_perm('change_dataset', user_object, dataset_object)
 
                 # put user in Editor group
                 editor_group = Group.objects.get(name='Editor')
diff --git a/signbank/dictionary/tests.py b/signbank/dictionary/tests.py
index 24d8278be..af9046335 100644
--- a/signbank/dictionary/tests.py
+++ b/signbank/dictionary/tests.py
@@ -179,7 +179,7 @@ def test_createGloss(self):
         self.assertContains(response, "You are not authorized to change the selected dataset.")
 
         # Give the test user permission to change a dataset
-        assign_perm('dictionary.change_dataset', self.user, test_dataset)
+        assign_perm('change_dataset', self.user, test_dataset)
         response = client.post('/dictionary/update/gloss/', create_gloss_form_data)
 
         glosses = Gloss.objects.filter(lemma__dataset=test_dataset)
@@ -499,7 +499,7 @@ def test_DatasetListView_ECV_export_empty_dataset(self):
         print('Test DatasetListView export_ecv with empty dataset')
 
         # Give the test user permission to change a dataset
-        assign_perm('dictionary.change_dataset', self.user, self.test_dataset)
+        assign_perm('change_dataset', self.user, self.test_dataset)
         print('User has permmission to change dataset.')
 
         client = Client(enforce_csrf_checks=False, json_encoder=DjangoJSONEncoder)
@@ -523,7 +523,7 @@ def test_DatasetListView_ECV_export_permission_change_dataset(self):
             return
 
         # Give the test user permission to change a dataset
-        assign_perm('dictionary.change_dataset', self.user, self.test_dataset)
+        assign_perm('change_dataset', self.user, self.test_dataset)
         print('User has permmission to change dataset.')
 
         client = Client(enforce_csrf_checks=False, json_encoder=DjangoJSONEncoder)
@@ -605,7 +605,7 @@ def test_Export_csv(self):
         print('Test Dataset is: ', self.test_dataset.acronym)
 
         # Give the test user permission to change a dataset
-        assign_perm('dictionary.change_dataset', self.user, self.test_dataset)
+        assign_perm('change_dataset', self.user, self.test_dataset)
         print('User has permmission to change dataset.')
 
         assign_perm('dictionary.export_csv', self.user)
@@ -631,7 +631,7 @@ def test_Import_csv_update_gloss_for_lemma(self):
         print('Test Dataset is: ', self.test_dataset.acronym)
 
         # Give the test user permission to change a dataset
-        assign_perm('dictionary.change_dataset', self.user, self.test_dataset)
+        assign_perm('change_dataset', self.user, self.test_dataset)
         print('User has permmission to change dataset.')
 
         # Create test lemma idgloss
@@ -739,7 +739,7 @@ def test_Import_csv_new_gloss_for_lemma(self):
         print('Test Dataset is: ', self.test_dataset.acronym)
 
         # Give the test user permission to change a dataset
-        assign_perm('dictionary.change_dataset', self.user, self.test_dataset)
+        assign_perm('change_dataset', self.user, self.test_dataset)
         print('User has permmission to change dataset.')
 
         gloss_id = 1
@@ -830,7 +830,7 @@ def test_create_and_delete_video(self):
         test_dataset = Dataset.objects.get(name=dataset_name)
         default_language = Language.objects.get(id=settings.DEFAULT_DATASET_LANGUAGE_ID)
 
-        assign_perm('dictionary.change_dataset', self.user, test_dataset)
+        assign_perm('change_dataset', self.user, test_dataset)
         print('User granted permmission to change dataset.')
 
         # Create a lemma
@@ -926,7 +926,7 @@ def test_create_and_delete_utf8_video(self):
         test_dataset = Dataset.objects.get(name=dataset_name)
         default_language = Language.objects.get(id=settings.DEFAULT_DATASET_LANGUAGE_ID)
 
-        assign_perm('dictionary.change_dataset', self.user, test_dataset)
+        assign_perm('change_dataset', self.user, test_dataset)
         print('User granted permmission to change dataset.')
 
         # Create a lemma
@@ -1259,7 +1259,7 @@ def test_User_is_not_dataset_manager(self):
         logged_in = self.client.login(username=self.user.username, password=self.user_password)
         self.assertTrue(logged_in)
 
-        assign_perm('dictionary.change_dataset', self.user, self.test_dataset)
+        assign_perm('change_dataset', self.user, self.test_dataset)
 
         # Grant view permission
         form_data = {'dataset_acronym': self.test_dataset.acronym, 'username': self.user2.username, 'add_view_perm': 'Grant'}
@@ -1337,7 +1337,7 @@ def test_User_is_dataset_manager(self):
         # Make the user member of the group dataset managers
         dataset_manager_group = Group.objects.get(name='Dataset_Manager')
         dataset_manager_group.user_set.add(self.user)
-        assign_perm('dictionary.change_dataset', self.user, self.test_dataset)
+        assign_perm('change_dataset', self.user, self.test_dataset)
 
         # Grant view permission
         form_data = {'dataset_acronym': self.test_dataset.acronym, 'username': self.user2.username, 'add_view_perm': 'Grant'}
@@ -1398,7 +1398,7 @@ def test_Set_default_language(self):
         # Make the user member of the group dataset managers
         dataset_manager_group = Group.objects.get(name='Dataset_Manager')
         dataset_manager_group.user_set.add(self.user)
-        assign_perm('dictionary.change_dataset', self.user, self.test_dataset)
+        assign_perm('change_dataset', self.user, self.test_dataset)
         response = self.client.get(reverse('admin_dataset_manager'), form_data, follow=True)
         self.assertContains(response, 'The default language of')
         self.assertEqual(response.status_code, 200)
@@ -1519,7 +1519,7 @@ def test_QueryLemmasWithoutGlosses(self):
         response = client.post('/dictionary/lemma/', {'delete_lemmas': 'delete_lemmas'}, follow=True)
         self.assertContains(response, 'You do not have change permission on the dataset of the lemma you are attempting to delete.')
 
-        assign_perm('dictionary.change_dataset', self.user, test_dataset)
+        assign_perm('change_dataset', self.user, test_dataset)
         self.user.save()
 
         response = client.post('/dictionary/lemma/?lemma_en=without', {'delete_lemmas': 'delete_lemmas'}, follow=True)
@@ -3741,7 +3741,7 @@ def test_crud_Senses(self):
         # Get the test dataset
         dataset_name = settings.DEFAULT_DATASET
         test_dataset = Dataset.objects.get(name=dataset_name)
-        assign_perm('dictionary.change_dataset', self.user, test_dataset)
+        assign_perm('change_dataset', self.user, test_dataset)
         assign_perm('dictionary.add_gloss', self.user)
         assign_perm('dictionary.change_gloss', self.user)
         assign_perm('view_dataset', self.user, test_dataset)
@@ -3910,7 +3910,7 @@ def test_Similar_Senses(self):
         # Get the test dataset
         dataset_name = settings.DEFAULT_DATASET
         test_dataset = Dataset.objects.get(name=dataset_name)
-        assign_perm('dictionary.change_dataset', self.user, test_dataset)
+        assign_perm('change_dataset', self.user, test_dataset)
         assign_perm('dictionary.add_gloss', self.user)
         assign_perm('dictionary.change_gloss', self.user)
         assign_perm('dictionary.add_sense', self.user)
@@ -4013,7 +4013,7 @@ def test_no_empty_translations_Senses(self):
         # Get the test dataset
         dataset_name = settings.DEFAULT_DATASET
         test_dataset = Dataset.objects.get(name=dataset_name)
-        assign_perm('dictionary.change_dataset', self.user, test_dataset)
+        assign_perm('change_dataset', self.user, test_dataset)
         assign_perm('dictionary.add_gloss', self.user)
         assign_perm('dictionary.change_gloss', self.user)
         assign_perm('dictionary.add_sense', self.user)

From 07a4735961c46057bc8fbdc8028e1fa3bc73ea74 Mon Sep 17 00:00:00 2001
From: susanodd <mijnoog@kpnmail.nl>
Date: Tue, 3 Sep 2024 11:13:07 +0200
Subject: [PATCH 09/11] #1316: Various commands to empty database.

These commands will be removed or commented out to prevent accidental use.
---
 .../delete_datasets_not_development.py        | 18 +++++++++++
 .../commands/delete_users_not_development.py  | 31 +++++++++----------
 2 files changed, 33 insertions(+), 16 deletions(-)
 create mode 100644 signbank/dictionary/management/commands/delete_datasets_not_development.py

diff --git a/signbank/dictionary/management/commands/delete_datasets_not_development.py b/signbank/dictionary/management/commands/delete_datasets_not_development.py
new file mode 100644
index 000000000..a8515bb0c
--- /dev/null
+++ b/signbank/dictionary/management/commands/delete_datasets_not_development.py
@@ -0,0 +1,18 @@
+from django.core.management.base import BaseCommand
+from signbank.dictionary.models import Dataset, Gloss, LemmaIdgloss
+
+
+class Command(BaseCommand):
+
+    help = 'remove users except for development'
+    args = ''
+
+    def handle(self, *args, **options):
+
+        all_datasets = Dataset.objects.all().distinct()
+
+        for dataset in all_datasets:
+
+            if dataset.acronym not in ['tstMH']:
+                dataset.delete()
+
diff --git a/signbank/dictionary/management/commands/delete_users_not_development.py b/signbank/dictionary/management/commands/delete_users_not_development.py
index 75924c66a..45bb4bfbf 100644
--- a/signbank/dictionary/management/commands/delete_users_not_development.py
+++ b/signbank/dictionary/management/commands/delete_users_not_development.py
@@ -1,25 +1,24 @@
-from django.core.mail import send_mail
-from django.core.management.base import BaseCommand, CommandError
-
-from signbank.settings import base
-from signbank.tools import get_users_without_dataset
-from signbank.dictionary.models import User
+from django.core.management.base import BaseCommand
+from signbank.dictionary.models import User, UserProfile
 
 class Command(BaseCommand):
-    help = 'Sends a list of all users without a dataset to an email addresss'
 
-    def add_arguments(self, parser):
-        parser.add_argument('address', type=str)
+    help = 'remove users except for development'
+    args = ''
 
     def handle(self, *args, **options):
 
-        users_without_dataset = User.objects.all()
-
-        if len(users_without_dataset) == 0:
+        all_users = User.objects.all().distinct()
+        if not all_users.count():
             return
 
-        for user in users_without_dataset:
-            if user.username not in ['susanodd', 'wessel', 'wesseltest',
-                                     'AnonymousUser', 'DivyaKanekal', 'jetske', 'jetsketest',
-                                     'micha', 'michatest']:
+        for user in all_users:
+
+            if user.username not in ['susanodd', 'wessel', 'AnonymousUser',
+                                     'DivyaKanekal', 'jetske',
+                                     'micha']:
+
+                userprofile = UserProfile.objects.filter(user=user)
+                if userprofile:
+                    userprofile.delete()
                 user.delete()

From 1ab81a3525c156551ef12670d3ef1978814cf562 Mon Sep 17 00:00:00 2001
From: susanodd <mijnoog@kpnmail.nl>
Date: Tue, 3 Sep 2024 12:31:14 +0200
Subject: [PATCH 10/11] #1316, #1270: Use server-specific settings, not
 default.

---
 signbank/dictionary/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/signbank/dictionary/views.py b/signbank/dictionary/views.py
index 3127fe5c6..db6b22c3a 100644
--- a/signbank/dictionary/views.py
+++ b/signbank/dictionary/views.py
@@ -35,7 +35,7 @@
 from signbank.dictionary.translate_choice_list import machine_value_to_translated_human_value, \
     check_value_to_translated_human_value
 
-import signbank.settings
+import signbank.settings.server_specific
 from signbank.settings.base import *
 from django.utils.translation import override, gettext_lazy as _
 

From b57f2fffabd420a25f63341d81f1f3acacbebf40 Mon Sep 17 00:00:00 2001
From: susanodd <mijnoog@kpnmail.nl>
Date: Tue, 10 Sep 2024 15:07:03 +0200
Subject: [PATCH 11/11] #1270: Keep more tables when creating empty.

As per review.
---
 signbank/dictionary/management/commands/create_empty_db.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/signbank/dictionary/management/commands/create_empty_db.py b/signbank/dictionary/management/commands/create_empty_db.py
index 569d5c0a3..af6f893af 100644
--- a/signbank/dictionary/management/commands/create_empty_db.py
+++ b/signbank/dictionary/management/commands/create_empty_db.py
@@ -33,7 +33,9 @@ def make_db_small(filename):
                    'django_site',
                    'guardian_groupobjectpermission',
                    'guardian_userobjectpermission',
-                   'dictionary_userprofile'
+                   'dictionary_userprofile',
+                   'django_content_type',
+                   'sqlite_sequence'
                    ]
     
     # Empty all other tables