Format, etc.

cedadev · Mar 27, 2024 · cd6ab89 · cd6ab89
1 parent 76fed67
commit cd6ab89
Show file tree

Hide file tree

Showing 6 changed files with 140 additions and 147 deletions.
diff --git a/jasmin_services/models/role.py b/jasmin_services/models/role.py
@@ -2,7 +2,6 @@
 import functools
 from datetime import date
 
-import django.apps
 import django.utils.timezone
 from django.conf import settings
 from django.contrib.auth import get_user_model

diff --git a/jasmin_services/templates/jasmin_services/includes/display_accesses.html b/jasmin_services/templates/jasmin_services/includes/display_accesses.html
@@ -35,10 +35,10 @@
  <td>
  {% if access.status == "EXPIRING" or access.status == "EXPIRED" %}
  {% if access.frontend.may_apply %}
- <a class="btn btn-warning btn-sm" href="{{ access.frontend.apply_url }}">
- Extend
- </a>
- {% endif %}
+  <a class="btn btn-warning btn-sm" href="{{ access.frontend.apply_url }}">
+  Extend
+  </a>
+  {% endif %}
  {% elif access.status == "REVOKED" or access.status == "REJECTED" or access.status == "INCOMPLETE" %}
  <button class="btn btn-warning btn-sm" type="button" data-bs-toggle="collapse" data-bs-target="#access-collapse-{{ access.frontend.id }}">
  See Reason
@@ -62,8 +62,8 @@
  <a class="btn btn-warning btn-sm" href="{{ access.frontend.apply_url }}">Add Info</a>
  {% elif access.status == "REVOKED" or access.status == "REJECTED" %}
  {% if access.frontend.may_apply %}
- <a class="btn btn-warning btn-sm" href="{{ access.frontend.apply_url }}">Reapply</a>
- {% endif %}
+  <a class="btn btn-warning btn-sm" href="{{ access.frontend.apply_url }}">Reapply</a>
+  {% endif %}
  {% endif %}
  <hr />
  {% endif %}
@@ -81,11 +81,13 @@
  <p>This request is awaiting consideration. You don't need to do anything.</p>
  <hr />
  {% endif %}
- <p>When you submitted your application, you supplied the following information:</p>
- {% for metadata in access.metadata.all %}
- <h5>{{ metadata.key }}:</h5> <p><i>{{metadata.value}}</i></p>
- {% endfor %}
- <hr />
+ {% block metadata %}
+ <p>When you submitted your application, you supplied the following information:</p>
+ {% for metadata in access.metadata.all %}
+ <h5>{{ metadata.key }}:</h5> <p><i>{{metadata.value}}</i></p>
+ {% endfor %}
+ <hr />
+ {% endblock %}
  </td>
  </tr>
  {% endfor %}