arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-02-04 06:08:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into bs4

Browse Source 
# 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:
FreneticScribbler
2020-04-15 16:22:50 +01:00
parent 5e60675115 3be06a7b25
commit 70995a0d0b
30 changed files with 934 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/templates/partials/asset_list_table.html
View File

@@ -17,6 +17,9 @@
<td class="assetCategory">{{ item.category }}</td>
<td class="assetStatus">{{ item.status }}</td>
<td class="d-none d-sm-table-cell">
{% if audit %}
<a type="button" class="btn btn-info btn-sm modal-href" href="{% url 'asset_audit' item.asset_id %}"><i class="fas fa-certificate"></i> Audit</a>
{% else %}
<div class="btn-group" role="group">
<a type="button" class="btn btn-primary btn-sm" href="{% url 'asset_detail' item.asset_id %}"><i class="fas fa-eye"></i><span class="d-none d-sm-inline"> View</span></a>
{% if perms.assets.change_asset %}
@@ -24,6 +27,7 @@
<a type="button" class="btn btn-info btn-sm" href="{% url 'asset_duplicate' item.asset_id %}"><i class="fas fa-clone"></i><span class="d-none d-sm-inline"> Duplicate</span></a>
{% endif %}
</div>
{% endif %}
</td>
</tr>
{% empty %}