From 0d883cb675b5f572e204165ec20726ae15db66a1 Mon Sep 17 00:00:00 2001
From: Raniere Silva <raniere@rgaiacs.com>
Date: Wed, 30 Aug 2017 16:06:45 +0100
Subject: [PATCH] Improve go to form buttons

---
 lowfat/templates/lowfat/blogs.html    | 16 ++++++++--------
 lowfat/templates/lowfat/expenses.html | 12 ++++++++----
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/lowfat/templates/lowfat/blogs.html b/lowfat/templates/lowfat/blogs.html
index f05ed306..71f02682 100644
--- a/lowfat/templates/lowfat/blogs.html
+++ b/lowfat/templates/lowfat/blogs.html
@@ -1,6 +1,6 @@
 <h2>
   Blog Posts
-  {% if user.is_staff or claimant and user == claimant.user %}
+  {% if user.is_staff or claimant and user == claimant.user or fund.claimant and user == fund.claimant.user %}
   {% if claimant %}
   <a class="btn btn-default" href="{% url 'blog' %}?claimant_id={{claimant.id}}">Submit a blog post</a>
   {% elif fund %}
@@ -29,7 +29,7 @@ <h2>
 <table class="table table-bordered sortable">
   <tbody>
     <tr>
-      {% if user.is_staff or claimant and user == claimant.user %}
+      {% if user.is_staff or claimant and user == claimant.user or fund.claimant and user == fund.claimant.user %}
       <th>
         Submitted date
       </th>
@@ -45,7 +45,7 @@ <h2>
         Funding Request
       </th>
       {% endif %}
-      {% if user.is_staff or claimant and user == claimant.user %}
+      {% if user.is_staff or claimant and user == claimant.user or fund.claimant and user == fund.claimant.user %}
       <th>
         Status
       </th>
@@ -53,7 +53,7 @@ <h2>
       <th>
         Publish date
       </th>
-      {% if user.is_staff or claimant and user == claimant.user %}
+      {% if user.is_staff or claimant and user == claimant.user or fund.claimant and user == fund.claimant.user %}
       <th>
         Actions
       </th>
@@ -72,7 +72,7 @@ <h2>
       {% endif %}
       {% endif %}
       >
-      {% if user.is_staff or claimant and user == claimant.user %}
+      {% if user.is_staff or claimant and user == claimant.user or fund.claimant and user == fund.claimant.user %}
       <td>
         {{ blog.added }}
       </td>
@@ -103,7 +103,7 @@ <h2>
         {% endif %}
       </td>
       {% endif %}
-      {% if user.is_staff or claimant and user == claimant.user %}
+      {% if user.is_staff or claimant and user == claimant.user or fund.claimant and user == fund.claimant.user %}
       <td>
         {{ blog.get_status_display }}
       </td>
@@ -115,7 +115,7 @@ <h2>
         <strong>Unpublished</strong>
         {% endif %}
       </td>
-      {% if user.is_staff or claimant and user == claimant.user %}
+      {% if user.is_staff or claimant and user == claimant.user or fund.claimant and user == fund.claimant.user %}
       <td>
         {% if user.is_staff %}
         <a class="icon" href="mailto:{{ blog.author.email }}"><i class="fa fa-envelope" aria-hidden="true"></i></a>
@@ -137,7 +137,7 @@ <h2>
       <td
         {% if user.is_staff %}
         colspan="7"
-        {% elif claimant and user == claimant.user %}
+        {% elif claimant and user == claimant.user or fund.claimant and user == fund.claimant.user %}
         colspan="5"
         {% else %}
         colspan="2"
diff --git a/lowfat/templates/lowfat/expenses.html b/lowfat/templates/lowfat/expenses.html
index 3286c0db..64093ac1 100644
--- a/lowfat/templates/lowfat/expenses.html
+++ b/lowfat/templates/lowfat/expenses.html
@@ -1,16 +1,20 @@
 <h2>
   Expenses
-  {% if user.is_staff or claimant and user == claimant.user %}
+  {% if user.is_staff or claimant and user == claimant.user or fund.claimant and user == fund.claimant.user %}
   {% if fund %}
-  {% if fund.status not in "RF" %}
+  {% if fund.status not in "RFCX" %}
   <a class="btn btn-default" href="{% url 'expense' %}{% if fund %}?fund_id={{fund.id}}{% endif %}">Submit expense claim</a>
   {% else %}
   <a class="btn btn-default" href="{% url 'expense' %}?claimant_id={{claimant.id}}">Submit expense claim</a>
   {% endif %}
   {% else %}
+  {% if user.is_staff and claimant %}
+  <a class="btn btn-default" href="{% url 'expense' %}?claimant_id={{claimant.id}}">Submit expense claim</a>
+  {% else %}
   <a class="btn btn-default" href="{% url 'expense' %}">Submit expense claim</a>
   {% endif %}
   {% endif %}
+  {% endif %}
 </h2>
 {% if user.is_staff %}
 <ul class="nav nav-tabs">
@@ -49,7 +53,7 @@ <h2>
       <th>
         Amount authorized for payment
       </th>
-      {% if user.is_staff or claimant and user == claimant.user %}
+      {% if user.is_staff or claimant and user == claimant.user or fund.claimant and user == fund.claimant.user %}
       <th>
         Actions
       </th>
@@ -141,7 +145,7 @@ <h2>
       <td
         {% if user.is_staff %}
         colspan="8"
-        {% elif claimant and user == claimant.user %}
+        {% elif claimant and user == claimant.user or fund.claimant and user == fund.claimant.user %}
         colspan="6"
         {% else %}
         colspan="3"