From 8360402e0a10233d95192a3cb97ba482e8c56e35 Mon Sep 17 00:00:00 2001
From: Iva Kaneva <i.k.kaneva@gmail.com>
Date: Sat, 26 Nov 2016 01:30:22 +0200
Subject: [PATCH] Rename `serviceport_assign` to `serviceport_add`

...to keep consistency with the naming convention along the rest of device related components
---
 netbox/dcim/urls.py                                         | 2 +-
 netbox/dcim/views.py                                        | 6 +++---
 netbox/templates/dcim/device.html                           | 4 ++--
 .../dcim/{serviceport_assign.html => serviceport_add.html}  | 0
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename netbox/templates/dcim/{serviceport_assign.html => serviceport_add.html} (100%)

diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py
index 0dea7afce..7e19e07df 100644
--- a/netbox/dcim/urls.py
+++ b/netbox/dcim/urls.py
@@ -103,7 +103,6 @@ urlpatterns = [
     url(r'^devices/(?P<pk>\d+)/inventory/$', views.device_inventory, name='device_inventory'),
     url(r'^devices/(?P<pk>\d+)/lldp-neighbors/$', views.device_lldp_neighbors, name='device_lldp_neighbors'),
     url(r'^devices/(?P<pk>\d+)/ip-addresses/assign/$', views.ipaddress_assign, name='ipaddress_assign'),
-    url(r'^devices/(?P<pk>\d+)/service-ports/assign/$', views.serviceport_assign, name='serviceport_assign'),
     url(r'^devices/(?P<pk>\d+)/add-secret/$', secret_add, name='device_addsecret'),
 
     # Console ports
@@ -170,6 +169,7 @@ urlpatterns = [
     url(r'^modules/(?P<pk>\d+)/delete/$', views.ModuleDeleteView.as_view(), name='module_delete'),
 
     # ServicePorts
+    url(r'^devices/(?P<pk>\d+)/service-ports/add/$', views.serviceport_add, name='serviceport_add'),
     url(r'^service-ports/(?P<pk>\d+)/$', views.serviceport, name='serviceport'),
     url(r'^service-ports/(?P<pk>\d+)/edit/$', views.ServicePortEditView.as_view(), name='serviceport_edit'),
     url(r'^service-ports/(?P<pk>\d+)/delete/$', views.ServicePortDeleteView.as_view(), name='serviceport_delete'),
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 4ec1932ab..38eafd70b 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -1641,7 +1641,7 @@ class ServicePortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
 
 
 @permission_required('ipam.add_ipaddress')
-def serviceport_assign(request, pk):
+def serviceport_add(request, pk):
     device = get_object_or_404(Device, pk=pk)
 
     if request.method == 'POST':
@@ -1662,14 +1662,14 @@ def serviceport_assign(request, pk):
                                                                                      service_port.device))
 
             if '_addanother' in request.POST:
-                return redirect('dcim:serviceport_assign', pk=device.pk)
+                return redirect('dcim:serviceport_add', pk=device.pk)
             else:
                 return redirect('dcim:device', pk=device.pk)
 
     else:
         form = forms.ServicePortCreateForm(device)
 
-    return render(request, 'dcim/serviceport_assign.html', {
+    return render(request, 'dcim/serviceport_add.html', {
         'device': device,
         'form': form,
         'cancel_url': reverse('dcim:device', kwargs={'pk': device.pk}),
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index a9258fca6..417ca9ad5 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -222,9 +222,9 @@
             {% endif %}
             {% if perms.ipam.add_ipaddress %}
                 <div class="panel-footer text-right">
-                    <a href="{% url 'dcim:serviceport_assign' pk=device.pk %}" class="btn btn-xs btn-primary">
+                    <a href="{% url 'dcim:serviceport_add' pk=device.pk %}" class="btn btn-xs btn-primary">
                         <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
-                        Assign port
+                        Add service port
                     </a>
                 </div>
             {% endif %}
diff --git a/netbox/templates/dcim/serviceport_assign.html b/netbox/templates/dcim/serviceport_add.html
similarity index 100%
rename from netbox/templates/dcim/serviceport_assign.html
rename to netbox/templates/dcim/serviceport_add.html