Removed the ability to delete funding requests, expense claims, and b…

…log posts #763

lowfat/models/expense.py

@@ -14,7 +14,7 @@
     ('C', 'Processing'),
     ('A', 'Approved'),
     ('R', 'Rejected'),  # When expense was rejected.
-    ('X', 'Remove'),  # When the fellow decided to remove their request.
+    ('X', 'Removed'),  # When the fellow decided to remove their request.
 )
 
 GRANT_HEADING = (

lowfat/models/fund.py

@@ -47,7 +47,7 @@
     ('R', 'Rejected'),  # Fund was rejected.
     ('F', 'Archived'),  # Approved funds with all claims and blog posts were processed. No funds are reserved.
     ('C', 'Cancelled'),  # When the fellow decided to cancel their request.
-    ('X', 'Remove'),  # When the fellow decided to remove their request.
+    ('X', 'Removed'),  # When the fellow decided to remove their request.
 )
 
 #: Set of statuses which constitute an approved fund
@@ -64,6 +64,7 @@
     'R': "Your fund request was declided.",
     'F': "We archived your fund request since all the expense claims were processed.",
     'C': "You decided to cancel this request for any reason.",
+    'X': "You decided to remove this request.",
 }
 
 GRANT_HEADING = (

lowfat/templates/lowfat/blog_detail.html

@@ -17,7 +17,7 @@ <h1>Blog Detail (Funding Request ID: {{ blog.fund.id }})
   {% endif %}
   {% if user.is_staff or blog.status == "U" %}
   <a title="Edit" class="btn btn-outline-dark" href="{% url 'blog_edit' blog.id %}" role="button"><span class="fa-solid fa-edit" aria-hidden="true"></span> Edit</a>
-  <a title="Remove" class="btn btn-outline-dark" href="{% url 'blog_remove' blog.id %}?next={% url 'dashboard' %}" role="button"><span class="fa-solid fa-remove" aria-hidden="true"></span> Remove</a>
+  {% comment %} <a title="Remove" class="btn btn-outline-dark" href="{% url 'blog_remove' blog.id %}?next={% url 'dashboard' %}" role="button"><span class="fa-solid fa-remove" aria-hidden="true"></span> Remove</a> {% endcomment %}
   {% endif %}
   {% endif %}
 </h1>

lowfat/templates/lowfat/blog_review.html

@@ -9,7 +9,7 @@ <h1>
   {% endif %}
   {% if user.is_staff %}
   <a title="Edit" class="btn btn-outline-dark" href="{% url 'blog_edit' blog.id %}" role="button"><span class="fa-solid fa-edit" aria-hidden="true"></span> Edit</a>
-  <a title="Remove" class="btn btn-outline-dark" href="{% url 'blog_remove' blog.id %}" role="button"><span class="fa-solid fa-remove" aria-hidden="true"></span> Remove</a>
+  {% comment %} <a title="Remove" class="btn btn-outline-dark" href="{% url 'blog_remove' blog.id %}" role="button"><span class="fa-solid fa-remove" aria-hidden="true"></span> Remove</a> {% endcomment %}
   {% endif %}
 </h1>
 <iframe class="blog-review-html" src="{{ blog.draft_url }}">

lowfat/templates/lowfat/blogs.html

@@ -146,7 +146,7 @@ <h2>
         {% endif %}
         {% if user.is_staff or blog.status == "U" %}
         <a  title="Edit" href="{% url 'blog_edit' blog.id %}"><span class="fa-solid fa-edit" aria-hidden="true"></span></a>
-        <a  title="Remove" href="{% url 'blog_remove' blog.id %}?next={{ request.path }}"><span class="fa-solid fa-remove" aria-hidden="true"></span></a>
+        {% comment %} <a  title="Remove" href="{% url 'blog_remove' blog.id %}?next={{ request.path }}"><span class="fa-solid fa-remove" aria-hidden="true"></span></a> {% endcomment %}
         {% endif %}
       </td>
       {% endif %}

lowfat/templates/lowfat/expense_detail.html

@@ -15,7 +15,7 @@ <h1>Expense Detail (Funding Request ID: {{ expense.fund.id }})
   {% endif %}
   {% if user.is_staff or expense.status in "SC" %}
   <a title="Edit" class="btn btn-outline-dark" href="{% url 'expense_edit_relative' expense.fund.id expense.relative_number %}"><span class="fa-solid fa-edit" aria-hidden="true"></span> Edit</a>
-  <a title="Remove" class="btn btn-outline-dark" href="{% url 'expense_remove_relative' expense.fund.id expense.relative_number %}?next={% url 'dashboard' %}"><span class="fa-solid fa-remove" aria-hidden="true"></span> Remove</a>
+  {% comment %} <a title="Remove" class="btn btn-outline-dark" href="{% url 'expense_remove_relative' expense.fund.id expense.relative_number %}?next={% url 'dashboard' %}"><span class="fa-solid fa-remove" aria-hidden="true"></span> Remove</a> {% endcomment %}
   {% endif %}
   {% endif %}
 </h1>

lowfat/templates/lowfat/expense_review.html

@@ -7,7 +7,7 @@ <h1>
   {% if user.is_staff %}
   <a title="View" class="btn btn-outline-dark" href="{% url 'expense_detail_relative' expense.fund.id expense.relative_number %}" role="button"><span class="fa-solid fa-eye" aria-hidden="true"></span> View</a>
   <a title="Edit" class="btn btn-outline-dark" href="{% url 'expense_edit_relative' expense.fund.id expense.relative_number %}" role="button"><span class="fa-solid fa-edit" aria-hidden="true"></span> Edit</a>
-  <a title="Remove" class="btn btn-outline-dark" href="{% url 'expense_remove_relative' expense.fund.id expense.relative_number %}" role="button"><span class="fa-solid fa-remove" aria-hidden="true"></span> Remove</a>
+  {% comment %} <a title="Remove" class="btn btn-outline-dark" href="{% url 'expense_remove_relative' expense.fund.id expense.relative_number %}" role="button"><span class="fa-solid fa-remove" aria-hidden="true"></span> Remove</a> {% endcomment %}
   {% endif %}
 </h1>
 

lowfat/templates/lowfat/expenses.html

@@ -138,7 +138,7 @@ <h2>
         {% endif %}
         {% if user.is_staff or expense.status in "SC" %}
         <a  title="Edit" href="{% url 'expense_edit_relative' expense.fund.id expense.relative_number %}"><span class="fa-solid fa-edit" aria-hidden="true"></span></a>
-        <a  title="Remove" href="{% url 'expense_remove_relative' expense.fund.id expense.relative_number %}?next={{ request.path }}"><span class="fa-solid fa-remove" aria-hidden="true"></span></a>
+        {% comment %} <a  title="Remove" href="{% url 'expense_remove_relative' expense.fund.id expense.relative_number %}?next={{ request.path }}"><span class="fa-solid fa-remove" aria-hidden="true"></span></a> {% endcomment %}
       </td>
       {% endif %}
       {% endif %}

lowfat/templates/lowfat/fund_detail.html

@@ -18,7 +18,7 @@ <h1>Funding request #{{ fund.id }}
   {% endif %}
   {% if user.is_staff or fund.status in "UP" %}
   <a title="Edit" class="btn btn-outline-dark" href="{% url 'fund_edit' fund.id %}"><span class="fa-solid fa-edit" aria-hidden="true"></span> Edit</a>
-  <a title="Remove" class="btn btn-outline-dark" href="{% url 'fund_remove' fund.id %}?next={% url 'dashboard' %}"><span class="fa-solid fa-remove" aria-hidden="true"></span> Remove</a>
+  {% comment %} <a title="Remove" class="btn btn-outline-dark" href="{% url 'fund_remove' fund.id %}?next={% url 'dashboard' %}"><span class="fa-solid fa-remove" aria-hidden="true"></span> Remove</a> {% endcomment %}
   {% endif %}
   {% endif %}
 </h1>

lowfat/templates/lowfat/fund_review.html

@@ -8,7 +8,7 @@ <h1>
   {% if user.is_staff %}
   <a title="View" class="btn btn-outline-dark" href="{% url 'fund_detail' fund.id %}" role="button"><span class="fa-solid fa-eye" aria-hidden="true"></span> View</a>
   <a title="Edit" class="btn btn-outline-dark" href="{% url 'fund_edit' fund.id %}" role="button"><span class="fa-solid fa-edit" aria-hidden="true"></span> Edit</a>
-  <a title="Remove" class="btn btn-outline-dark" href="{% url 'fund_remove' fund.id %}" role="button"><span class="fa-solid fa-remove" aria-hidden="true"></span> Remove</a>
+  {% comment %} <a title="Remove" class="btn btn-outline-dark" href="{% url 'fund_remove' fund.id %}" role="button"><span class="fa-solid fa-remove" aria-hidden="true"></span> Remove</a> {% endcomment %}
   {% endif %}
 </h1>
 {% if fund.access_token %}

lowfat/templates/lowfat/funds.html

@@ -155,7 +155,7 @@
         {% endif %}
         {% if user.is_staff or fund.status in "UP" %}
         <a title="Edit" href="{% url 'fund_edit' fund.id %}"><span class="fa-solid fa-edit" aria-hidden="true"></span></a>
-        <a title="Remove" href="{% url 'fund_remove' fund.id %}?next={{ request.path }}"><span class="fa-solid fa-remove" aria-hidden="true"></span></a>
+        {% comment %} <a title="Remove" href="{% url 'fund_remove' fund.id %}?next={{ request.path }}"><span class="fa-solid fa-remove" aria-hidden="true"></span></a> {% endcomment %}
         {% endif %}
       </td>
       {% endif %}