aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Lemon <lemon@matthewlemon.com>2020-10-25 16:26:57 +0000
committerMatthew Lemon <lemon@matthewlemon.com>2020-10-25 16:26:57 +0000
commitc43b877741e0f7bce686ac1e565a13b5b6620bb9 (patch)
tree40384e1cc331196df0d76dd22ec95ffa096f103d
parentd84922abdd48b1a1530b9d5816297ea21be2abd9 (diff)
added link to document url in comments box in caf detail page
-rw-r--r--ctrack/caf/templates/caf/caf_detail.html12
-rw-r--r--ctrack/organisations/templates/organisations/organisation_detail.html12
2 files changed, 20 insertions, 4 deletions
diff --git a/ctrack/caf/templates/caf/caf_detail.html b/ctrack/caf/templates/caf/caf_detail.html
index 52da584..7c15343 100644
--- a/ctrack/caf/templates/caf/caf_detail.html
+++ b/ctrack/caf/templates/caf/caf_detail.html
@@ -119,7 +119,17 @@
<td class="col-3">{{ event.type_descriptor }}</td>
<td class="col-2">{{ event.user.name }}</td>
<td class="col-2">{{ event.short_description }}</td>
- <td class="col-4">{{ event.comments }}</td>
+ <td class="col-4">
+ {% if event.comments %}
+ {{ event.comments }}
+ {% else %}
+ NA
+ {% endif %}
+ <br>
+ {% if event.document_link %}
+ <a class="small" href="{{ event.document_link }}">[URL]</a>
+ {% endif %}
+ </td>
</tr>
{% endfor %}
</tbody>
diff --git a/ctrack/organisations/templates/organisations/organisation_detail.html b/ctrack/organisations/templates/organisations/organisation_detail.html
index 02c7ab0..5cbdcb8 100644
--- a/ctrack/organisations/templates/organisations/organisation_detail.html
+++ b/ctrack/organisations/templates/organisations/organisation_detail.html
@@ -240,11 +240,11 @@
{% endif %}
</td>
{% if event.requested_response_date and not event.response_received_date %}
- <td class="col-1" style="background-color: #f7def1;">
+ <td style="background-color: #f7def1;">
<strong>{{ event.requested_response_date }}</strong>
</td>
{% else %}
- <td class="col-1">
+ <td>
&nbsp;
</td>
{% endif %}
@@ -313,7 +313,13 @@
<td class="col-2">{{ event.user.username }}</td>
{% endif %}
<td>{{ event.short_description }}</td>
- <td>{{ event.comments }}<br>
+ <td>
+ {% if event.comments %}
+ {{ event.comments }}
+ {% else %}
+ NA
+ {% endif %}
+ <br>
{% if event.document_link %}
<a class="small" href="{{ event.document_link }}">[URL]</a>
{% endif %}