Merge branch 'step06-templates' into step07-navigation

README.md

@@ -1,4 +1,3 @@
 ## netbox-access-lists
 
 Manage simple access control lists in NetBox
-

netbox_access_lists/__init__.py

@@ -10,4 +10,3 @@ class NetBoxAccessListsConfig(PluginConfig):
 
 
 config = NetBoxAccessListsConfig
-

netbox_access_lists/forms.py

@@ -29,4 +29,3 @@ class AccessListRuleForm(NetBoxModelForm):
             'access_list', 'index', 'description', 'source_prefix', 'source_ports', 'destination_prefix',
             'destination_ports', 'protocol', 'action', 'tags',
         )
-

netbox_access_lists/models.py

@@ -101,4 +101,3 @@ class AccessListRule(NetBoxModel):
 
     def get_absolute_url(self):
         return reverse('plugins:netbox_access_lists:accesslistrule', args=[self.pk])
-

netbox_access_lists/tables.py

@@ -34,4 +34,3 @@ class AccessListRuleTable(NetBoxTable):
             'access_list', 'index', 'source_prefix', 'source_ports', 'destination_prefix',
             'destination_ports', 'protocol', 'action', 'actions',
         )
-

netbox_access_lists/urls.py

@@ -27,4 +27,3 @@ urlpatterns = (
     }),
 
 )
-

netbox_access_lists/views.py

@@ -5,7 +5,7 @@ from . import forms, models, tables
 
 
 #
-# Access lists
+# AccessList views
 #
 
 class AccessListView(generic.ObjectView):
@@ -37,7 +37,7 @@ class AccessListDeleteView(generic.ObjectDeleteView):
 
 
 #
-# Access list rules
+# AccessListRule views
 #
 
 class AccessListRuleView(generic.ObjectView):
@@ -56,5 +56,3 @@ class AccessListRuleEditView(generic.ObjectEditView):
 
 class AccessListRuleDeleteView(generic.ObjectDeleteView):
     queryset = models.AccessListRule.objects.all()
-
-

setup.py

@@ -4,10 +4,8 @@ setup(
     name='netbox-access-lists',
     version='0.1',
     description='An example NetBox plugin',
-    license='Apache 2.0',
     install_requires=[],
     packages=find_packages(),
     include_package_data=True,
     zip_safe=False,
 )
-