From 40819185987d25a919b46cca60c1cafd581c15db Mon Sep 17 00:00:00 2001 From: Arona Date: Wed, 27 May 2020 17:06:50 +0200 Subject: [PATCH] Fix some asset template things --- .../commands/generateSampleRIGSData.py | 3 ++- assets/templates/asset_list.html | 3 ++- assets/templates/cable_type_list.html | 16 +++++++++++----- assets/urls.py | 4 ++-- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/RIGS/management/commands/generateSampleRIGSData.py b/RIGS/management/commands/generateSampleRIGSData.py index e5733238..f602d2e3 100644 --- a/RIGS/management/commands/generateSampleRIGSData.py +++ b/RIGS/management/commands/generateSampleRIGSData.py @@ -173,7 +173,8 @@ class Command(BaseCommand): "add_venue", "change_venue", "view_venue", "add_asset", "change_asset", "delete_asset", "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", "add_payment", "change_payment", "delete_payment"] diff --git a/assets/templates/asset_list.html b/assets/templates/asset_list.html index a5e7f570..27e14490 100644 --- a/assets/templates/asset_list.html +++ b/assets/templates/asset_list.html @@ -36,11 +36,12 @@ -
+
+
{% include 'partials/asset_list_table.html' %}
{% if is_paginated %} diff --git a/assets/templates/cable_type_list.html b/assets/templates/cable_type_list.html index 34f69f8f..3b282f2d 100644 --- a/assets/templates/cable_type_list.html +++ b/assets/templates/cable_type_list.html @@ -7,7 +7,12 @@ - +
+
+ New +
+
+
@@ -24,18 +29,19 @@ {% endfor %}
{{ item.circuits }} {{ item.cores }} - View - Edit + View + Edit
- +
+
{% if is_paginated %}
{% paginator %}
{% endif %} - +
{% endblock %} diff --git a/assets/urls.py b/assets/urls.py index 7f65834c..897fae57 100644 --- a/assets/urls.py +++ b/assets/urls.py @@ -22,10 +22,10 @@ urlpatterns = [ path('activity', permission_required_with_403('assets.view_asset') (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//update/', permission_required_with_403('assets.change_cable_type')(views.CableTypeUpdate.as_view()), name='cable_type_update'), - path('cabletype//detail/', permission_required_with_403('assets.view_cable_type')(views.CableTypeDetail.as_view()), name='cable_type_detail'), + path('cabletype//detail/', views.CableTypeDetail.as_view(), name='cable_type_detail'), path('asset/search/', views.AssetSearch.as_view(), name='asset_search_json'), path('asset/id//embed/',