mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-01-17 13:32:15 +00:00
* FEAT: Initial work on revision history for assets The revision history for individual items mostly works, though it shows database ID where it should show asset ID. Recent changes feed isn't yet done. * FEAT: Initial implementation of asset activity stream * CHORE: Fix pep8 * FIX: Asset history table 'branding' * FIX: Individual asset version history is now correctly filtered * FEAT: Make revision history for suppliers accessible * CHORE: *sings* And a pep8 in a broken tree... * Refactored out duplicated code from `AssetVersionHistory * CHORE: pep8 And another random bit of wierd whitespace I found Co-authored-by: Matthew Smith <mattysmith22@googlemail.com> Closes #358
93 lines
3.3 KiB
HTML
93 lines
3.3 KiB
HTML
{% extends request.is_ajax|yesno:"base_ajax.html,base_assets.html" %}
|
|
{% load static %}
|
|
{% load paginator from filters %}
|
|
{% load to_class_name from filters %}
|
|
|
|
{% block title %}Asset Activity Stream{% endblock %}
|
|
|
|
{# TODO: Find a way to reduce code duplication...can't just include the content because of the IDs... #}
|
|
|
|
{% block js %}
|
|
<script src="{% static "js/tooltip.js" %}"></script>
|
|
<script src="{% static "js/popover.js" %}"></script>
|
|
<script src="{% static "js/moment.min.js" %}"></script>
|
|
<script>
|
|
$(function () {
|
|
$('[data-toggle="popover"]').popover().click(function(){
|
|
if($(this).attr('href')){
|
|
window.location.href = $(this).attr('href');
|
|
}
|
|
});
|
|
|
|
// This keeps timeago values correct, but uses an insane amount of resources
|
|
// $(function () {
|
|
// setInterval(function() {
|
|
// $('.date').each(function (index, dateElem) {
|
|
// var $dateElem = $(dateElem);
|
|
// var formatted = moment($dateElem.attr('data-date')).fromNow();
|
|
// $dateElem.text(formatted);
|
|
// })
|
|
// });
|
|
// }, 10000);
|
|
|
|
|
|
$('.date').each(function (index, dateElem) {
|
|
var $dateElem = $(dateElem);
|
|
var formatted = moment($dateElem.attr('data-date')).fromNow();
|
|
$dateElem.text(formatted);
|
|
});
|
|
|
|
|
|
})
|
|
|
|
</script>
|
|
{% endblock %}
|
|
|
|
{% block content %}
|
|
<div class="col-sm-12">
|
|
<div class="row">
|
|
<div class="col-sm-12">
|
|
<h3>Asset Activity Stream</h3>
|
|
</div>
|
|
<div class="text-right col-sm-12">{% paginator %}</div>
|
|
</div>
|
|
<div class="table-responsive">
|
|
|
|
<table class="table table-striped">
|
|
<thead>
|
|
<tr>
|
|
<td>Date</td>
|
|
<td>Object</td>
|
|
<td>Version ID</td>
|
|
<td>User</td>
|
|
<td>Changes</td>
|
|
<td>Comment</td>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
{% for version in object_list %}
|
|
|
|
<tr>
|
|
<td>{{ version.revision.date_created }}</td>
|
|
<td><a href="{{ version.changes.new.get_absolute_url }}">{{version.changes.new|to_class_name}} {{ version.changes.new.asset_id|default:version.changes.new.pk }}</a></td>
|
|
<td>{{ version.pk }}|{{ version.revision.pk }}</td>
|
|
<td>{{ version.revision.user.name }}</td>
|
|
<td>
|
|
{% if version.changes.old == None %}
|
|
{{version.changes.new|to_class_name}} Created
|
|
{% else %}
|
|
{% include 'RIGS/version_changes.html' %}
|
|
{% endif %} </td>
|
|
<td>{{ version.changes.revision.comment }}</td>
|
|
</tr>
|
|
|
|
{% endfor %}
|
|
|
|
</tbody>
|
|
</table>
|
|
|
|
</div>
|
|
<div class="align-right">{% paginator %}</div>
|
|
</div>
|
|
{% endblock %}
|