Skip to content
Snippets Groups Projects
Unverified Commit 84e05a1b authored by Fredrik Jonsson's avatar Fredrik Jonsson Committed by GitHub
Browse files

Merge pull request #2397 from HyphaApp/enhancement/gh-2390-user-is-staff

enhance: Use is_apply_staff in replacement of is_staff for users
parents 254a4064 a2e24e31
No related branches found
No related tags found
No related merge requests found
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<div> <div>
<h5 class="determination-outcome">Determination: {{ determination.get_outcome_display }}</h5> <h5 class="determination-outcome">Determination: {{ determination.get_outcome_display }}</h5>
</div> </div>
{% if request.user.is_staff %} {% if request.user.is_apply_staff %}
<div> <div>
<a class="link link--edit-determination is-active" href="{% url 'apply:submissions:determinations:edit' submission_pk=determination.submission.id pk=determination.id %}"> <a class="link link--edit-determination is-active" href="{% url 'apply:submissions:determinations:edit' submission_pk=determination.submission.id pk=determination.id %}">
Edit Edit
......
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
{% user_can_upload_contract object request.user as can_upload_contract %} {% user_can_upload_contract object request.user as can_upload_contract %}
{% if can_upload_contract %} {% if can_upload_contract %}
<div class="modal" id="upload-contract"> <div class="modal" id="upload-contract">
{% if not user.is_staff %} {% if not user.is_apply_staff %}
<h4 class="modal__header-bar">Upload Signed Contract</h4> <h4 class="modal__header-bar">Upload Signed Contract</h4>
{% else %} {% else %}
<h4 class="modal__header-bar">Upload Contract</h4> <h4 class="modal__header-bar">Upload Contract</h4>
......
...@@ -10,7 +10,7 @@ def user_has_approved(project, user): ...@@ -10,7 +10,7 @@ def user_has_approved(project, user):
@register.simple_tag @register.simple_tag
def can_send_for_approval(project, user): def can_send_for_approval(project, user):
return user.is_staff and project.can_send_for_approval return user.is_apply_staff and project.can_send_for_approval
@register.simple_tag @register.simple_tag
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment