diff --git a/assets/urls.py b/assets/urls.py index ed3c0633..27cc1d17 100644 --- a/assets/urls.py +++ b/assets/urls.py @@ -14,6 +14,8 @@ urlpatterns = [ path('asset/id//duplicate/', permission_required_with_403('assets.add_asset')(views.AssetDuplicate.as_view()), name='asset_duplicate'), path('asset/id//history/', views.AssetVersionHistory.as_view(), name='asset_history', kwargs={'model': models.Asset}), + path('activity', + permission_required_with_403('assets.view_asset')(views.ActivityTable.as_view()), name='asset_activity_table'), path('asset/search/', views.AssetSearch.as_view(), name='asset_search_json'), diff --git a/assets/views.py b/assets/views.py index 7b8b0cce..5c05910d 100644 --- a/assets/views.py +++ b/assets/views.py @@ -217,3 +217,12 @@ class AssetVersionHistory(AssetIDUrlMixin, versioning.VersionHistory): {'verbose_name': queryset.model._meta.verbose_name}) return context + +class ActivityTable(generic.ListView): + model = versioning.RIGSVersion + template_name = "RIGS/activity_table.html" + paginate_by = 25 + + def get_queryset(self): + versions = versioning.RIGSVersion.objects.get_for_multiple_models([models.Asset, models.Supplier]) + return versions diff --git a/templates/base_assets.html b/templates/base_assets.html index b75ae15b..288d7dc9 100644 --- a/templates/base_assets.html +++ b/templates/base_assets.html @@ -29,6 +29,6 @@ {% endif %} {% if perms.assets.view_asset %} -
  • Recent Changes
  • +
  • Recent Changes
  • {% endif %} {% endblock %}