From b6a7ffc7ff79a12bb13230a40451ede1d1aca367 Mon Sep 17 00:00:00 2001 From: Edo Storm Date: Wed, 3 Apr 2024 15:07:47 +0200 Subject: [PATCH 1/3] feat: supervisor decide action on detail view --- reviews/utils/review_actions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reviews/utils/review_actions.py b/reviews/utils/review_actions.py index 540f9a72c..c03f886c0 100644 --- a/reviews/utils/review_actions.py +++ b/reviews/utils/review_actions.py @@ -85,7 +85,7 @@ def get_available_decision(self): user = self.user review = self.review - if review.stage != review.Stages.COMMISSION: + if review.stage in (review.Stages.COMMISSION, review.Stages.SUPERVISOR): return False try: From 74d7b24868253eeb4b3c0ef895ea8214745ed23f Mon Sep 17 00:00:00 2001 From: Edo Storm Date: Wed, 3 Apr 2024 15:08:52 +0200 Subject: [PATCH 2/3] fix: secretary explanation header within if-is_secretary --- reviews/templates/reviews/action_explaination.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/reviews/templates/reviews/action_explaination.html b/reviews/templates/reviews/action_explaination.html index fd106c7fc..99a220ceb 100644 --- a/reviews/templates/reviews/action_explaination.html +++ b/reviews/templates/reviews/action_explaination.html @@ -49,10 +49,10 @@

{% trans "Uitleg" %}

-
-

{% trans "Uitleg secretaris" %}

-
    - {% if request.user|is_secretary %} +{% if request.user|is_secretary %} +
    +
      +

      {% trans "Uitleg secretaris" %}

    • {% blocktrans trimmed %} Klik op @@ -107,6 +107,6 @@

      {% trans "Uitleg secretaris" %}

      van de bevestigingsbrief te veranderen. {% endblocktrans %}
    • - {% endif %} -
    -
    +
+
+{% endif %} From d7c2f95df7e4eb3fcb31fde1bec42a09d2771832 Mon Sep 17 00:00:00 2001 From: Edo Storm Date: Thu, 4 Apr 2024 10:20:30 +0200 Subject: [PATCH 3/3] fix: removed obsolete if-statement --- reviews/templates/reviews/action_explaination.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reviews/templates/reviews/action_explaination.html b/reviews/templates/reviews/action_explaination.html index 99a220ceb..6ba47a1aa 100644 --- a/reviews/templates/reviews/action_explaination.html +++ b/reviews/templates/reviews/action_explaination.html @@ -50,7 +50,7 @@

{% trans "Uitleg" %}

{% if request.user|is_secretary %} -
+

    {% trans "Uitleg secretaris" %}