From c059227d5d3696cb58a212d054b4ce7fd3313915 Mon Sep 17 00:00:00 2001 From: FreneticScribbler Date: Thu, 5 Dec 2019 12:42:05 +0000 Subject: [PATCH] Revert "CHANGE: Restrict viewing asset DB to keyholders." This reverts commit 2c334196d5e300019668553c09d4eae7bfd8c975. --- RIGS/templates/RIGS/index.html | 10 +++++----- assets/urls.py | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/RIGS/templates/RIGS/index.html b/RIGS/templates/RIGS/index.html index bc1cc659..826839e6 100644 --- a/RIGS/templates/RIGS/index.html +++ b/RIGS/templates/RIGS/index.html @@ -11,7 +11,7 @@
- +

Quick Links

@@ -20,7 +20,7 @@ Rigboard Calendar {% if perms.RIGS.add_event %} New Event{% endif %} - {% if perms.assets.view_asset %} Asset Database{% endif %} + Asset Database
@@ -29,7 +29,7 @@ Pre-Event Risk Assessment Price List Subhire Insurance Form - +
@@ -73,8 +73,8 @@
{% if perms.RIGS.view_event %}
- {% include 'RIGS/activity_feed.html' %} - + {% include 'RIGS/activity_feed.html' %} +
{% endif %}
diff --git a/assets/urls.py b/assets/urls.py index 1c03a1d9..fa5facd0 100644 --- a/assets/urls.py +++ b/assets/urls.py @@ -4,9 +4,9 @@ from assets import views from PyRIGS.decorators import permission_required_with_403 urlpatterns = [ - path('', permission_required_with_403('assets.view_asset')(views.AssetList.as_view()), name='asset_index'), - path('asset/list/', permission_required_with_403('assets.view_asset')(views.AssetList.as_view()), name='asset_list'), - path('asset/id//', permission_required_with_403('assets.view_asset')(views.AssetDetail.as_view()), name='asset_detail'), + path('', views.AssetList.as_view(), name='asset_index'), + path('asset/list/', views.AssetList.as_view(), name='asset_list'), + path('asset/id//', views.AssetDetail.as_view(), name='asset_detail'), path('asset/create/', permission_required_with_403('assets.create_asset')(views.AssetCreate.as_view()), name='asset_create'), path('asset/id//edit/', permission_required_with_403('assets.change_asset')(views.AssetEdit.as_view()), name='asset_update'), path('asset/id//duplicate/', permission_required_with_403('assets.create_asset')(views.AssetDuplicate.as_view()), name='asset_duplicate'),