Added views for DeviceRoles

netbox/dcim/forms.py

@@ -262,6 +262,21 @@ class InterfaceTemplateForm(forms.ModelForm, BootstrapMixin):
 
 
 #
+# Device roles
+#
+
+class DeviceRoleForm(forms.ModelForm, BootstrapMixin):
+
+    class Meta:
+        model = DeviceRole
+        fields = ['name', 'slug', 'color']
+
+
+class DeviceRoleBulkDeleteForm(ConfirmationForm):
+    pk = forms.ModelMultipleChoiceField(queryset=DeviceRole.objects.all(), widget=forms.MultipleHiddenInput)
+
+
+#
 # Devices
 #
 

netbox/dcim/models.py

@@ -392,6 +392,9 @@ class DeviceRole(models.Model):
     def __unicode__(self):
         return self.name
 
+    def get_absolute_url(self):
+        return "{}?role={}".format(reverse('dcim:device_list'), self.slug)
+
 
 class Platform(models.Model):
     """

netbox/dcim/tables.py

@@ -2,7 +2,7 @@ import django_tables2 as tables
 from django_tables2.utils import Accessor
 
 from .models import Site, RackGroup, Rack, DeviceType, ConsolePortTemplate, ConsoleServerPortTemplate, \
-    PowerPortTemplate, PowerOutletTemplate, InterfaceTemplate, Device, ConsolePort, PowerPort
+    PowerPortTemplate, PowerOutletTemplate, InterfaceTemplate, DeviceRole, Device, ConsolePort, PowerPort
 
 DEVICE_LINK = """
 <a href="{% url 'dcim:device' pk=record.pk %}">{{ record.name|default:'<span class="label label-info">Unnamed device</span>' }}</a>
@@ -12,6 +12,10 @@ RACKGROUP_EDIT_LINK = """
 <a href="{% url 'dcim:rackgroup_edit' pk=record.pk %}">Edit</a>
 """
 
+DEVICEROLE_EDIT_LINK = """
+<a href="{% url 'dcim:devicerole_edit' slug=record.slug %}">Edit</a>
+"""
+
 STATUS_ICON = """
 <span class="glyphicon glyphicon-{% if record.status %}ok-sign text-success" title="Active{% else %}minus-sign text-danger" title="Offline{% endif %}" aria-hidden="true"></span>
 """
@@ -225,6 +229,34 @@ class InterfaceTemplateBulkDeleteTable(InterfaceTemplateTable):
 
 
 #
+# Device roles
+#
+
+class DeviceRoleTable(tables.Table):
+    name = tables.LinkColumn(verbose_name='Name')
+    device_count = tables.Column(accessor=Accessor('device_count'), verbose_name='Devices')
+    slug = tables.Column(verbose_name='Slug')
+    color = tables.Column(verbose_name='Color')
+
+    class Meta:
+        model = DeviceRole
+        fields = ('name', 'device_count', 'slug', 'color')
+        empty_text = "No device roles were found."
+        attrs = {
+            'class': 'table table-hover',
+        }
+
+
+class DeviceRoleBulkEditTable(DeviceRoleTable):
+    pk = tables.CheckBoxColumn()
+    edit = tables.TemplateColumn(template_code=DEVICEROLE_EDIT_LINK, verbose_name='')
+
+    class Meta(DeviceRoleTable.Meta):
+        model = None  # django_tables2 bugfix
+        fields = ('pk', 'name', 'device_count', 'slug', 'color')
+
+
+#
 # Devices
 #
 

netbox/dcim/urls.py

@@ -64,6 +64,12 @@ urlpatterns = [
     url(r'^device-types/(?P<pk>\d+)/interfaces/delete/$', views.component_template_delete,
         {'model': InterfaceTemplate}, name='devicetype_delete_interface'),
 
+    # Device roles
+    url(r'^device-roles/$', views.DeviceRoleListView.as_view(), name='devicerole_list'),
+    url(r'^device-roles/add/$', views.DeviceRoleAddView.as_view(), name='devicerole_add'),
+    url(r'^device-roles/delete/$', views.DeviceRoleBulkDeleteView.as_view(), name='devicerole_bulk_delete'),
+    url(r'^device-roles/(?P<slug>[\w-]+)/edit/$', views.DeviceRoleEditView.as_view(), name='devicerole_edit'),
+
     # Devices
     url(r'^devices/$', views.DeviceListView.as_view(), name='device_list'),
     url(r'^devices/add/$', views.DeviceAddView.as_view(), name='device_add'),

netbox/dcim/views.py

@@ -24,24 +24,24 @@ from .filters import RackGroupFilter, RackFilter, DeviceTypeFilter, DeviceFilter
     PowerConnectionFilter, InterfaceConnectionFilter
 from .forms import SiteForm, SiteImportForm, RackGroupForm, RackGroupFilterForm, RackGroupBulkDeleteForm, RackForm, \
     RackImportForm, RackBulkEditForm, RackBulkDeleteForm, RackFilterForm, DeviceTypeForm, DeviceTypeBulkEditForm, \
-    DeviceTypeBulkDeleteForm, DeviceTypeFilterForm, DeviceForm, DeviceImportForm, DeviceBulkEditForm, \
-    DeviceBulkDeleteForm, DeviceFilterForm, ConsolePortForm, ConsolePortCreateForm, ConsolePortConnectionForm, \
-    ConsoleConnectionImportForm, ConsoleServerPortForm, ConsoleServerPortCreateForm, ConsoleServerPortConnectionForm, \
-    PowerPortForm, PowerPortCreateForm, PowerPortConnectionForm, PowerConnectionImportForm, PowerOutletForm, \
-    PowerOutletCreateForm, PowerOutletConnectionForm, InterfaceForm, InterfaceCreateForm, InterfaceBulkCreateForm, \
-    InterfaceConnectionForm, InterfaceConnectionDeletionForm, InterfaceConnectionImportForm, \
-    ConsoleConnectionFilterForm, PowerConnectionFilterForm, InterfaceConnectionFilterForm, IPAddressForm, \
-    ConsolePortTemplateForm, ConsoleServerPortTemplateForm, PowerPortTemplateForm, PowerOutletTemplateForm, \
-    InterfaceTemplateForm
-from .models import Site, RackGroup, Rack, DeviceType, ConsolePortTemplate, ConsoleServerPortTemplate, \
+    DeviceTypeBulkDeleteForm, DeviceTypeFilterForm, DeviceRoleForm, DeviceRoleBulkDeleteForm, DeviceForm, \
+    DeviceImportForm, DeviceBulkEditForm, DeviceBulkDeleteForm, DeviceFilterForm, ConsolePortForm, \
+    ConsolePortCreateForm, ConsolePortConnectionForm, ConsoleConnectionImportForm, ConsoleServerPortForm, \
+    ConsoleServerPortCreateForm, ConsoleServerPortConnectionForm, PowerPortForm, PowerPortCreateForm, \
+    PowerPortConnectionForm, PowerConnectionImportForm, PowerOutletForm, PowerOutletCreateForm, \
+    PowerOutletConnectionForm, InterfaceForm, InterfaceCreateForm, InterfaceBulkCreateForm, InterfaceConnectionForm, \
+    InterfaceConnectionDeletionForm, InterfaceConnectionImportForm, ConsoleConnectionFilterForm, \
+    PowerConnectionFilterForm, InterfaceConnectionFilterForm, IPAddressForm, ConsolePortTemplateForm, \
+    ConsoleServerPortTemplateForm, PowerPortTemplateForm, PowerOutletTemplateForm, InterfaceTemplateForm
+from .models import Site, RackGroup, Rack, DeviceType, DeviceRole, ConsolePortTemplate, ConsoleServerPortTemplate, \
     PowerPortTemplate, PowerOutletTemplate, InterfaceTemplate, Device, ConsolePort, ConsoleServerPort, PowerPort, \
     PowerOutlet, Interface, InterfaceConnection, Module, CONNECTION_STATUS_CONNECTED
 from .tables import SiteTable, RackGroupTable, RackGroupBulkEditTable, RackTable, RackBulkEditTable, DeviceTypeTable, \
-    DeviceTypeBulkEditTable, DeviceTable, DeviceBulkEditTable, DeviceImportTable, ConsoleConnectionTable, \
-    PowerConnectionTable, InterfaceConnectionTable, ConsolePortTemplateTable, ConsoleServerPortTemplateTable, \
-    PowerPortTemplateTable, PowerOutletTemplateTable, InterfaceTemplateTable, ConsolePortTemplateBulkDeleteTable, \
-    ConsoleServerPortTemplateBulkDeleteTable, PowerPortTemplateBulkDeleteTable, PowerOutletTemplateBulkDeleteTable, \
-    InterfaceTemplateBulkDeleteTable
+    DeviceTypeBulkEditTable, DeviceRoleTable, DeviceRoleBulkEditTable, DeviceTable, DeviceBulkEditTable, \
+    DeviceImportTable, ConsoleConnectionTable, PowerConnectionTable, InterfaceConnectionTable, \
+    ConsolePortTemplateTable, ConsoleServerPortTemplateTable, PowerPortTemplateTable, PowerOutletTemplateTable, \
+    InterfaceTemplateTable, ConsolePortTemplateBulkDeleteTable, ConsoleServerPortTemplateBulkDeleteTable, \
+    PowerPortTemplateBulkDeleteTable, PowerOutletTemplateBulkDeleteTable, InterfaceTemplateBulkDeleteTable
 
 
 EXPANSION_PATTERN = '\[(\d+-\d+)\]'
@@ -459,6 +459,41 @@ def component_template_delete(request, pk, model):
 
 
 #
+# Device roles
+#
+
+class DeviceRoleListView(ObjectListView):
+    queryset = DeviceRole.objects.annotate(device_count=Count('devices'))
+    table = DeviceRoleTable
+    edit_table = DeviceRoleBulkEditTable
+    edit_table_permissions = ['dcim.change_devicerole', 'dcim.delete_devicerole']
+    template_name = 'dcim/devicerole_list.html'
+
+
+class DeviceRoleAddView(PermissionRequiredMixin, ObjectAddView):
+    permission_required = 'dcim.add_devicerole'
+    model = DeviceRole
+    form_class = DeviceRoleForm
+    template_name = 'dcim/devicerole_edit.html'
+    cancel_url = 'dcim:devicerole_list'
+
+
+class DeviceRoleEditView(PermissionRequiredMixin, ObjectEditView):
+    permission_required = 'dcim.change_devicerole'
+    model = DeviceRole
+    form_class = DeviceRoleForm
+    return_url = 'dcim:devicerole_list'
+    template_name = 'dcim/devicerole_edit.html'
+
+
+class DeviceRoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
+    permission_required = 'dcim.delete_devicerole'
+    cls = DeviceRole
+    form = DeviceRoleBulkDeleteForm
+    default_redirect_url = 'dcim:devicerole_list'
+
+
+#
 # Devices
 #
 

netbox/templates/dcim/devicerole_edit.html

@@ -0,0 +1,11 @@
+{% extends 'utilities/obj_edit.html' %}
+{% load form_helpers %}
+
+{% block form %}
+    <div class="panel panel-default">
+        <div class="panel-heading"><strong>Device Role</strong></div>
+        <div class="panel-body">
+            {% render_form form %}
+        </div>
+    </div>
+{% endblock %}

netbox/templates/dcim/devicerole_list.html

@@ -0,0 +1,21 @@
+{% extends '_base.html' %}
+{% load helpers %}
+
+{% block title %}Device Roles{% endblock %}
+
+{% block content %}
+<div class="pull-right">
+    {% if perms.dcim.add_devicerole %}
+        <a href="{% url 'dcim:devicerole_add' %}" class="btn btn-primary">
+            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
+            Add a device role
+        </a>
+    {% endif %}
+</div>
+<h1>Device Roles</h1>
+<div class="row">
+	<div class="col-md-12">
+        {% include 'dcim/inc/devicerole_table.html' %}
+    </div>
+</div>
+{% endblock %}

netbox/templates/dcim/inc/devicerole_table.html

@@ -0,0 +1,14 @@
+{% load render_table from django_tables2 %}
+{% if perms.dcim.delete_devicerole %}
+    <form method="post" class="form form-horizontal">
+        {% csrf_token %}
+        <input type="hidden" name="redirect_url" value="{{ request.path }}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" />
+        {% render_table table table_template|default:'table.html' %}
+        <button type="submit" name="_delete" formaction="{% url 'dcim:devicerole_bulk_delete' %}" class="btn btn-danger btn-sm">
+            <span class="glyphicon glyphicon-trash" aria-hidden="true"></span>
+            Delete Selected
+        </button>
+    </form>
+{% else %}
+    {% render_table table table_template|default:'table.html' %}
+{% endif %}

netbox/templates/utilities/obj_edit.html

@@ -26,12 +26,11 @@
             <div class="col-md-6 col-md-offset-3 text-right">
                 {% if obj %}
                     <button type="submit" name="_update" class="btn btn-primary">Update</button>
-                    <a href="{{ obj.get_absolute_url }}" class="btn btn-default">Cancel</a>
                 {% else %}
                     <button type="submit" name="_create" class="btn btn-primary">Create</button>
                     <button type="submit" name="_addanother" class="btn btn-primary">Create and Add Another</button>
-                    <a href="{{ cancel_url }}" class="btn btn-default">Cancel</a>
                 {% endif %}
+                <a href="{{ cancel_url }}" class="btn btn-default">Cancel</a>
             </div>
         </div>
     </form>

netbox/utilities/views.py

@@ -118,6 +118,7 @@ class ObjectEditView(View):
     model = None
     form_class = None
     template_name = None
+    return_url = None
 
     def get_object(self, kwargs):
         # Look up object by slug if one has been provided. Otherwise, use PK.
@@ -135,7 +136,7 @@ class ObjectEditView(View):
             'obj': obj,
             'form': form,
             'obj_type': self.model._meta.verbose_name,
-            'cancel_url': obj.get_absolute_url(),
+            'cancel_url': reverse(self.return_url) if self.return_url else obj.get_absolute_url(),
         })
 
     def post(self, request, *args, **kwargs):
@@ -155,7 +156,7 @@ class ObjectEditView(View):
             'obj': obj,
             'form': form,
             'obj_type': self.model._meta.verbose_name,
-            'cancel_url': obj.get_absolute_url(),
+            'cancel_url': reverse(self.return_url) if self.return_url else obj.get_absolute_url(),
         })