arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-02-07 23:49:42 +00:00
Code Issues Projects Releases Wiki Activity

Fix some asset template things

Browse Source
This commit is contained in:
FreneticScribbler
2020-05-27 17:06:50 +02:00
parent b742d3f8c4
commit 4081918598
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
RIGS/management/commands/generateSampleRIGSData.py
View File

@@ -173,7 +173,8 @@ class Command(BaseCommand):
"add_venue", "change_venue", "view_venue", "add_venue", "change_venue", "view_venue",
"add_asset", "change_asset", "delete_asset", "add_asset", "change_asset", "delete_asset",
"asset_finance", "view_asset", "view_supplier", "asset_finance", "asset_finance", "view_asset", "view_supplier", "asset_finance",
"add_supplier"] "add_supplier", "view_cable_type", "change_cable_type",
"add_cable_type"]
financePerms = keyholderPerms + ["add_invoice", "change_invoice", "view_invoice", financePerms = keyholderPerms + ["add_invoice", "change_invoice", "view_invoice",
"add_payment", "change_payment", "delete_payment"] "add_payment", "change_payment", "delete_payment"]

3
assets/templates/asset_list.html
View File

@@ -36,11 +36,12 @@
<button id="filter-submit" type="submit" class="btn btn-secondary">Filter</button> <button id="filter-submit" type="submit" class="btn btn-secondary">Filter</button>
</div> </div>
</form> </form>
<div class="row"> <div class="row">
<div class="col px-0"> <div class="col px-0">
<a href="{% url 'asset_create' %}" class="btn btn-success float-right my-3">New <span class="fas fa-plus"></span></a> <a href="{% url 'asset_create' %}" class="btn btn-success float-right my-3">New <span class="fas fa-plus"></span></a>
</div> </div>
</div>
<div class="row">
{% include 'partials/asset_list_table.html' %} {% include 'partials/asset_list_table.html' %}
</div> </div>
{% if is_paginated %} {% if is_paginated %}

16
assets/templates/cable_type_list.html
View File

@@ -7,7 +7,12 @@
<div class="page-header"> <div class="page-header">
<h1>Cable Type List</h1> <h1>Cable Type List</h1>
</div> </div>
<div class="row">
<div class="col px-0">
<a href="{% url 'cable_type_create' %}" class="btn btn-success float-right my-3">New <span class="fas fa-plus"></span></a>
</div>
</div>
<div class="row">
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
@@ -24,18 +29,19 @@
<td>{{ item.circuits }}</td> <td>{{ item.circuits }}</td>
<td>{{ item.cores }}</td> <td>{{ item.cores }}</td>
<td> <td>
<a href="{% url 'cable_type_detail' item.pk %}" class="btn btn-primary"><span class="fas fas-eye-open"></span> View</a> <a href="{% url 'cable_type_detail' item.pk %}" class="btn btn-primary"><span class="fas fa-eye"></span> View</a>
<a href="{% url 'cable_type_update' item.pk %}" class="btn btn-warning"><span class="fas fas-edit"></span> Edit</a> <a href="{% url 'cable_type_update' item.pk %}" class="btn btn-warning"><span class="fas fa-edit"></span> Edit</a>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
</div>
<div class="row">
{% if is_paginated %} {% if is_paginated %}
<div class="text-center"> <div class="text-center">
{% paginator %} {% paginator %}
</div> </div>
{% endif %} {% endif %}
</div>
{% endblock %} {% endblock %}

4
assets/urls.py
View File

@@ -22,10 +22,10 @@ urlpatterns = [
path('activity', permission_required_with_403('assets.view_asset') path('activity', permission_required_with_403('assets.view_asset')
(views.ActivityTable.as_view()), name='asset_activity_table'), (views.ActivityTable.as_view()), name='asset_activity_table'),
path('cabletype/list/', permission_required_with_403('assets.view_cable_type')(views.CableTypeList.as_view()), name='cable_type_list'), path('cabletype/list/', views.CableTypeList.as_view(), name='cable_type_list'),
path('cabletype/create/', permission_required_with_403('assets.add_cable_type')(views.CableTypeCreate.as_view()), name='cable_type_create'), path('cabletype/create/', permission_required_with_403('assets.add_cable_type')(views.CableTypeCreate.as_view()), name='cable_type_create'),
path('cabletype/<int:pk>/update/', permission_required_with_403('assets.change_cable_type')(views.CableTypeUpdate.as_view()), name='cable_type_update'), path('cabletype/<int:pk>/update/', permission_required_with_403('assets.change_cable_type')(views.CableTypeUpdate.as_view()), name='cable_type_update'),
path('cabletype/<int:pk>/detail/', permission_required_with_403('assets.view_cable_type')(views.CableTypeDetail.as_view()), name='cable_type_detail'), path('cabletype/<int:pk>/detail/', views.CableTypeDetail.as_view(), name='cable_type_detail'),
path('asset/search/', views.AssetSearch.as_view(), name='asset_search_json'), path('asset/search/', views.AssetSearch.as_view(), name='asset_search_json'),
path('asset/id/<str:pk>/embed/', path('asset/id/<str:pk>/embed/',