Merge pull request #662 from DH-IT-Portal-Development/acceptation

Back-merge log-call PR to develop
DH-IT-Portal-Development · Apr 24, 2024 · 8ac03c1 · 8ac03c1
2 parents c9de29d + 62419c7
commit 8ac03c1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/main/models.py b/main/models.py
@@ -1,8 +1,12 @@
+import logging
+
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import User
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
+logger = logging.getLogger("ethics.main")
+
 
 class YesNoDoubt(models.TextChoices):
     YES = "Y", _("ja")
@@ -159,6 +163,6 @@ def process_faculties(self, faculties):
                     continue
 
                 faculty_obj.users.add(self)
-            except:
-                # Just ignore any errors...
+            except:  # noQA
+                logger.error(f"Error processing faculty for user", exc_info=True)
                 continue
diff --git a/reviews/templates/reviews/decision_form.html b/reviews/templates/reviews/decision_form.html
@@ -24,7 +24,7 @@ <h2>{% trans "Aanvraag beoordelen" %}</h2>
                             De aanvraag is <a href="{{ pdf_url }}" target="_blank">hier</a> in te zien (downloadt als PDF).
                         {% endblocktrans %}
                     </p>
-                    {% if decision.is_final_decision %}
+                    {% if decision.is_final_decision and not decision.go %}
                         <div class="alert alert-info">
                             {% blocktrans trimmed %}
                                 <strong>Attentie:</strong> jij bent de laatste beoordelaar van deze aanvraag. Daarom kun je na het versturen je oordeel en commentaar niet meer bewerken. Controleer je antwoorden goed.