From 11ba3715026f90629f9e33485adfeb27e2af7879 Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Wed, 29 Jan 2025 13:21:35 -0500 Subject: [PATCH 1/5] Set auth_required=True on PluginMenuItems --- netbox_branching/navigation.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/netbox_branching/navigation.py b/netbox_branching/navigation.py index fa48de5..ed7ed72 100644 --- a/netbox_branching/navigation.py +++ b/netbox_branching/navigation.py @@ -9,6 +9,7 @@ PluginMenuItem( link='plugins:netbox_branching:branch_list', link_text=_('Branches'), + auth_required=True, buttons=( PluginMenuButton('plugins:netbox_branching:branch_add', _('Add'), 'mdi mdi-plus-thick'), PluginMenuButton('plugins:netbox_branching:branch_bulk_import', _('Import'), 'mdi mdi-upload'), @@ -16,7 +17,8 @@ ), PluginMenuItem( link='plugins:netbox_branching:changediff_list', - link_text=_('Change Diffs') + link_text=_('Change Diffs'), + auth_required=True ), )), ), From 3291ceb2ca65d7d451410f8b3fe59dfd5b3edfd9 Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Tue, 4 Feb 2025 10:34:29 -0500 Subject: [PATCH 2/5] Merge changes from feature --- netbox_branching/navigation.py | 2 +- netbox_branching/urls.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox_branching/navigation.py b/netbox_branching/navigation.py index ed7ed72..13847f4 100644 --- a/netbox_branching/navigation.py +++ b/netbox_branching/navigation.py @@ -12,7 +12,7 @@ auth_required=True, buttons=( PluginMenuButton('plugins:netbox_branching:branch_add', _('Add'), 'mdi mdi-plus-thick'), - PluginMenuButton('plugins:netbox_branching:branch_bulk_import', _('Import'), 'mdi mdi-upload'), + PluginMenuButton('plugins:netbox_branching:branch_import', _('Import'), 'mdi mdi-upload'), ) ), PluginMenuItem( diff --git a/netbox_branching/urls.py b/netbox_branching/urls.py index 790c2e2..d89b216 100644 --- a/netbox_branching/urls.py +++ b/netbox_branching/urls.py @@ -8,7 +8,7 @@ path('branches/', views.BranchListView.as_view(), name='branch_list'), path('branches/add/', views.BranchEditView.as_view(), name='branch_add'), path('branches/import/', views.BranchBulkImportView.as_view(), name='branch_bulk_import'), - path('branches/edit/', views.BranchBulkEditView.as_view(), name='branch_bulk_edit'), + path('branches/edit/', views.BranchBulkEditView.as_view(), name='branch_edit'), path('branches/delete/', views.BranchBulkDeleteView.as_view(), name='branch_bulk_delete'), path('branches//', include(get_model_urls('netbox_branching', 'branch'))), From e749536292ca1d85e6cadc211faf9758dfb94dda Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Tue, 4 Feb 2025 10:35:14 -0500 Subject: [PATCH 3/5] Fix paths --- netbox_branching/urls.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox_branching/urls.py b/netbox_branching/urls.py index d89b216..55d2308 100644 --- a/netbox_branching/urls.py +++ b/netbox_branching/urls.py @@ -7,8 +7,8 @@ # Branches path('branches/', views.BranchListView.as_view(), name='branch_list'), path('branches/add/', views.BranchEditView.as_view(), name='branch_add'), - path('branches/import/', views.BranchBulkImportView.as_view(), name='branch_bulk_import'), - path('branches/edit/', views.BranchBulkEditView.as_view(), name='branch_edit'), + path('branches/import/', views.BranchBulkImportView.as_view(), name='branch_import'), + path('branches/edit/', views.BranchBulkEditView.as_view(), name='branch_bulk_edit'), path('branches/delete/', views.BranchBulkDeleteView.as_view(), name='branch_bulk_delete'), path('branches//', include(get_model_urls('netbox_branching', 'branch'))), From 5617aeda0fa7c94d01c619098fba6a3479dd2351 Mon Sep 17 00:00:00 2001 From: Brian Tiemann Date: Tue, 4 Feb 2025 12:52:13 -0500 Subject: [PATCH 4/5] Set min_version to 4.2.3 --- netbox_branching/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox_branching/__init__.py b/netbox_branching/__init__.py index ce43f00..56e5b50 100644 --- a/netbox_branching/__init__.py +++ b/netbox_branching/__init__.py @@ -14,7 +14,7 @@ class AppConfig(PluginConfig): description = 'A git-like branching implementation for NetBox' version = '0.5.3' base_url = 'branching' - min_version = '4.1.9' + min_version = '4.2.3' middleware = [ 'netbox_branching.middleware.BranchMiddleware' ] From be0a1ef36f23d7782c8cd87d2a27bca1267ccaa3 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 5 Feb 2025 10:21:38 -0500 Subject: [PATCH 5/5] Revert renaming of bulk import view --- netbox_branching/navigation.py | 2 +- netbox_branching/urls.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox_branching/navigation.py b/netbox_branching/navigation.py index 13847f4..ed7ed72 100644 --- a/netbox_branching/navigation.py +++ b/netbox_branching/navigation.py @@ -12,7 +12,7 @@ auth_required=True, buttons=( PluginMenuButton('plugins:netbox_branching:branch_add', _('Add'), 'mdi mdi-plus-thick'), - PluginMenuButton('plugins:netbox_branching:branch_import', _('Import'), 'mdi mdi-upload'), + PluginMenuButton('plugins:netbox_branching:branch_bulk_import', _('Import'), 'mdi mdi-upload'), ) ), PluginMenuItem( diff --git a/netbox_branching/urls.py b/netbox_branching/urls.py index 55d2308..790c2e2 100644 --- a/netbox_branching/urls.py +++ b/netbox_branching/urls.py @@ -7,7 +7,7 @@ # Branches path('branches/', views.BranchListView.as_view(), name='branch_list'), path('branches/add/', views.BranchEditView.as_view(), name='branch_add'), - path('branches/import/', views.BranchBulkImportView.as_view(), name='branch_import'), + path('branches/import/', views.BranchBulkImportView.as_view(), name='branch_bulk_import'), path('branches/edit/', views.BranchBulkEditView.as_view(), name='branch_bulk_edit'), path('branches/delete/', views.BranchBulkDeleteView.as_view(), name='branch_bulk_delete'), path('branches//', include(get_model_urls('netbox_branching', 'branch'))),