#1270: Empty initial database, restored permissions.

Signbank · Aug 28, 2024 · 64d1612 · 64d1612
1 parent 428b6b1
commit 64d1612
Show file tree

Hide file tree

Showing 28 changed files with 114 additions and 114 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -55,15 +55,15 @@ <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" %}
                 {% endif %}
             </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
@@ -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
@@ -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
@@ -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>