Merge pull request #821 from DH-IT-Portal-Development/fix/archive_acc…

…ess_bug Fix/archive access bug
DH-IT-Portal-Development · Dec 16, 2024 · 6cf6a38 · 6cf6a38
2 parents ebb4033 + fbdcd5d
commit 6cf6a38
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/main/templates/main/index.html b/main/templates/main/index.html
@@ -86,8 +86,10 @@ <h2>{% trans "Voordat je begint" %}</h2>
            href="{% url 'proposals:copy_revision' %}">{% trans "Nieuwe revisie starten" %}</a>
         <a class="btn btn-outline-secondary"
            href="{% url 'proposals:copy_amendment' %}">{% trans "Nieuw amendement starten" %}</a>
-        <a class="btn btn-outline-secondary"
-           href="{% url 'proposals:archive' 'LK' %}">{% trans "Archief" %}</a>
+        {% if can_view_archive %}
+            <a class="btn btn-outline-secondary"
+               href="{% url 'proposals:archive' 'LK' %}">{% trans "Archief" %}</a>
+        {% endif %}
     </div>
     <div class="uu-container">
         <div class="row gx-3 gy-4">

diff --git a/main/views.py b/main/views.py
@@ -124,6 +124,7 @@ def get_context_data(self, *args, **kwargs):
 
         context["is_humanities"] = is_member_of_humanities(self.request.user)
         context["proposals"] = self.get_priority_proposals()
+        context["can_view_archive"] = can_view_archive(self.request.user)
 
         return context
 
@@ -426,6 +427,8 @@ class HumanitiesOrPrivilegeRequiredMixin(UserPassesTestMixin):
     to a privileged set of groups.
     """
 
+    raise_exception = True
+
     def test_func(self, user):
         return can_view_archive(user)
 

diff --git a/proposals/utils/proposal_utils.py b/proposals/utils/proposal_utils.py
@@ -30,6 +30,7 @@
     "OverwriteStorage",
 ]
 
+
 def generate_ref_number():
     """
     Generates a reference number for a new(!) Proposal.
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ @@
         "OverwriteStorage",
     ]
     def generate_ref_number():
         """
         Generates a reference number for a new(!) Proposal.
@@ Expand Down @@