From 126c605cd65c8d8479d5c5f31567990a3f0201da Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 22 Jun 2023 09:20:21 -0400 Subject: [PATCH] Remove edit view for ConfigRevision instances --- netbox/extras/tables/tables.py | 2 +- netbox/extras/urls.py | 14 ++++----- netbox/extras/views.py | 34 ++++++++++----------- netbox/templates/extras/configrevision.html | 13 -------- 4 files changed, 24 insertions(+), 39 deletions(-) diff --git a/netbox/extras/tables/tables.py b/netbox/extras/tables/tables.py index 3ec9e298a..e41bc9126 100644 --- a/netbox/extras/tables/tables.py +++ b/netbox/extras/tables/tables.py @@ -43,7 +43,7 @@ REVISION_BUTTONS = """ class ConfigRevisionTable(NetBoxTable): is_active = columns.BooleanColumn() actions = columns.ActionsColumn( - actions=('edit', 'delete'), + actions=('delete',), extra_buttons=REVISION_BUTTONS ) diff --git a/netbox/extras/urls.py b/netbox/extras/urls.py index 479a4bc07..b3909391a 100644 --- a/netbox/extras/urls.py +++ b/netbox/extras/urls.py @@ -85,6 +85,13 @@ urlpatterns = [ path('journal-entries/import/', views.JournalEntryBulkImportView.as_view(), name='journalentry_import'), path('journal-entries//', include(get_model_urls('extras', 'journalentry'))), + # Config revisions + path('config-revisions/', views.ConfigRevisionListView.as_view(), name='configrevision_list'), + path('config-revisions/add/', views.ConfigRevisionEditView.as_view(), name='configrevision_add'), + path('config-revisions/delete/', views.ConfigRevisionBulkDeleteView.as_view(), name='configrevision_bulk_delete'), + path('config-revisions//restore/', views.ConfigRevisionRestoreView.as_view(), name='configrevision_restore'), + path('config-revisions//', include(get_model_urls('extras', 'configrevision'))), + # Change logging path('changelog/', views.ObjectChangeListView.as_view(), name='objectchange_list'), path('changelog//', include(get_model_urls('extras', 'objectchange'))), @@ -115,11 +122,4 @@ urlpatterns = [ # Markdown path('render/markdown/', views.RenderMarkdownView.as_view(), name="render_markdown"), - - # Config Revision - path('config-revision/', views.ConfigRevisionListView.as_view(), name='configrevision_list'), - path('config-revision/add/', views.ConfigRevisionEditView.as_view(), name='configrevision_add'), - path('config-revision/delete/', views.ConfigRevisionBulkDeleteView.as_view(), name='configrevision_bulk_delete'), - path('config-revision//restore', views.ConfigRevisionRestoreView.as_view(), name='configrevision_restore'), - path('config-revision//', include(get_model_urls('extras', 'configrevision'))), ] diff --git a/netbox/extras/views.py b/netbox/extras/views.py index 5dea9d189..39ae91b2c 100644 --- a/netbox/extras/views.py +++ b/netbox/extras/views.py @@ -1178,25 +1178,9 @@ class ScriptResultView(ContentTypePermissionRequiredMixin, View): # -# Markdown +# Config Revisions # -class RenderMarkdownView(View): - - def post(self, request): - form = forms.RenderMarkdownForm(request.POST) - if not form.is_valid(): - HttpResponseBadRequest() - rendered = render_markdown(form.cleaned_data['text']) - - return HttpResponse(rendered) - - -# -# Config Revision -# - - class ConfigRevisionListView(generic.ObjectListView): queryset = ConfigRevision.objects.all() filterset = filtersets.ConfigRevisionFilterSet @@ -1209,7 +1193,6 @@ class ConfigRevisionView(generic.ObjectView): queryset = ConfigRevision.objects.all() -@register_model_view(ConfigRevision, 'edit') class ConfigRevisionEditView(generic.ObjectEditView): queryset = ConfigRevision.objects.all() form = forms.ConfigRevisionForm @@ -1260,3 +1243,18 @@ class ConfigRevisionRestoreView(ContentTypePermissionRequiredMixin, View): messages.success(request, f"Restored configuration revision #{pk}") return redirect(reverse('extras:configrevision')) + + +# +# Markdown +# + +class RenderMarkdownView(View): + + def post(self, request): + form = forms.RenderMarkdownForm(request.POST) + if not form.is_valid(): + HttpResponseBadRequest() + rendered = render_markdown(form.cleaned_data['text']) + + return HttpResponse(rendered) diff --git a/netbox/templates/extras/configrevision.html b/netbox/templates/extras/configrevision.html index 5c62bc10a..1c7eeb2dd 100644 --- a/netbox/templates/extras/configrevision.html +++ b/netbox/templates/extras/configrevision.html @@ -10,18 +10,9 @@ {% endblock %} {% block controls %} - {# Clone/Edit/Delete Buttons #}
{% plugin_buttons object %} - - {# Extra buttons #} - {% block extra_controls %}{% endblock %} - - {% if request.user|can_change:object %} - {% edit_button object %} - {% endif %} -
{% custom_links object %} @@ -29,10 +20,6 @@
{% endblock controls %} - -{% block tabs %} -{% endblock %} - {% block content %}