diff --git a/versioning/urls.py b/versioning/urls.py index 04d2c77a..48d6ef17 100644 --- a/versioning/urls.py +++ b/versioning/urls.py @@ -1,6 +1,8 @@ from django.urls import path from django.apps import apps from django.urls import path +from django.template.loader import get_template +from django.template import TemplateDoesNotExist from PyRIGS.decorators import (permission_required_with_403) from versioning import views @@ -11,29 +13,32 @@ urlpatterns = [ name='activity_feed'), ] -# Well except this specific hack for legacy URLs...if only the RIGS app had been named 'rigboard'! -for app in apps.get_app_configs(): +for app in [apps.get_app_config(label) for label in ("RIGS", "assets")]: appname = str(app.label) - if appname == 'RIGS': appname = 'rigboard' table_name = 'activity_table' else: table_name = appname + '_activity_table' - + # TODO Proper Permissions - urlpatterns += [path(appname + '/activity/', permission_required_with_403('RIGS.add_event')(views.ActivityTable.as_view()), - name=table_name, kwargs={'app': appname, 'models': views.get_models(app.label)}), ] + urlpatterns += [ + path(appname + '/activity/', permission_required_with_403('RIGS.add_event')(views.ActivityTable.as_view()), + name=table_name, kwargs={'app': appname, 'models': views.get_models(app.label)}), ] for model in views.get_models(app=app.label): modelname = model.__name__.lower() if appname == 'rigboard': urlpatterns += [ - path('{}//history/'.format(modelname), permission_required_with_403('{}.change_{}'.format(app.label, modelname))(views.VersionHistory.as_view()), + path('{}//history/'.format(modelname), + permission_required_with_403('{}.change_{}'.format(app.label, modelname))( + views.VersionHistory.as_view()), name='{}_history'.format(modelname), kwargs={'model': model, 'app': appname, }), ] else: urlpatterns += [ - path('{}/{}//history/'.format(appname, modelname), permission_required_with_403('{}.change_{}'.format(app.label, modelname))(views.VersionHistory.as_view()), + path('{}/{}//history/'.format(appname, modelname), + permission_required_with_403('{}.change_{}'.format(app.label, modelname))( + views.VersionHistory.as_view()), name='{}_history'.format(modelname), kwargs={'model': model, 'app': appname, }), ]