Merge branch 'master' into bs4

# Conflicts:
#	assets/models.py
#	assets/templates/asset_update.html
#	assets/templates/partials/asset_buttons.html
#	assets/templates/partials/asset_list_table_body.html
#	assets/views.py
#	templates/base_assets.html
This commit is contained in:
2020-04-15 16:22:50 +01:00
30 changed files with 934 additions and 132 deletions

View File

@@ -13,6 +13,7 @@
<div class="btn-group">
<a href="{% url 'asset_update' object.asset_id %}" class="btn btn-warning"><i class="fas fa-edit"></i> Edit</a>
<a class="btn btn-info" href="{% url 'asset_duplicate' object.asset_id %}"><i class="fas fa-clone"></i> Duplicate</a>
<a type="button" class="btn btn-info" href="{% url 'asset_audit' object.asset_id %}"><i class="fas fa-certificate"></i> Audit</a>
</div>
{% endif %}
{% if create or edit or duplicate %}