Fix misprint and fix result text

devapp/templates/devapp/manage_ports/list.html

@@ -22,7 +22,7 @@
                             <td>{{ port.num }}</td>
                             <td>{{ port.descr }}</td>
                             {% if port.num_abons > 1 %}
-                                {% url 'devapp:fix_port_confict' dev.user_group.id dev.id port.id as fixurl %}
+                                {% url 'devapp:fix_port_conflict' dev.user_group.id dev.id port.id as fixurl %}
                                 <td class="text-danger"><b>{{ port.num_abons }}</b>. {% blocktrans with furl=fixurl %}Port should not have more than one subscriber, <a href='{{ furl }}'>fix that</a>{% endblocktrans %}</td>
                             {% else %}
                                 <td>{{ port.num_abons }}</td>

devapp/urls.py

@@ -16,7 +16,7 @@ urlpatterns = [
     url(r'^(?P<group_id>\d+)/(?P<device_id>\d+)/add$', views.add_single_port, name='add_port'),
     url(r'^(?P<group_id>\d+)/(?P<device_id>\d+)/edit$', views.dev, name='edit'),
     url(r'^(\d+)/(?P<device_id>\d+)/ports$', views.manage_ports, name='manage_ports'),
-    url(r'^(?P<group_id>\d+)/(?P<device_id>\d+)/ports/(?P<port_id>\d+)/fix_port_confict$', views.fix_port_confict, name='fix_port_confict'),
+    url(r'^(?P<group_id>\d+)/(?P<device_id>\d+)/ports/(?P<port_id>\d+)/fix_port_conflict$', views.fix_port_conflict, name='fix_port_conflict'),
     url(r'^(\d+)/(?P<device_id>\d+)/ports_add', views.add_ports, name='add_ports'),
     url(r'^(\d+)/(?P<device_id>\d+)/(?P<portid>\d+)_(?P<status>[0-1]{1})$', views.toggle_port, name='port_toggle'),
     url(r'^(?P<group_id>\d+)/(?P<device_id>\d+)/(?P<portid>\d+)/del$', views.delete_single_port, name='del_port'),

devapp/views.py

@@ -457,6 +457,8 @@ def fix_onu(request):
         if parent is not None:
             manobj = parent.get_manager_object()
             ports = manobj.get_list_keyval('.1.3.6.1.4.1.3320.101.10.1.1.3')
+            text = '<span class="glyphicon glyphicon-ok"></span> <span class="hidden-xs">%s</span>' %\
+                    (_('Device with mac address %(mac)s does not exist') % {'mac': mac})
             for srcmac, snmpnum in ports:
                 real_mac = ':'.join(['%x' % ord(i) for i in srcmac])
                 if mac == real_mac:
@@ -465,10 +467,8 @@ def fix_onu(request):
                     status = 0
                     text = '<span class="glyphicon glyphicon-ok"></span> <span class="hidden-xs">%s</span>' % _('Fixed')
                     break
-            text = '<span class="glyphicon glyphicon-ok"></span> <span class="hidden-xs">%s</span>' %\
-                (_('Device with mac address %(mac)s does not exist') % {'mac': mac})
         else:
-            text = text + ' %s' % _('Parent device not found')
+            text = text + '\n%s' % _('Parent device not found')
     except Device.DoesNotExist:
         pass
     return JsonResponse({
@@ -478,7 +478,7 @@ def fix_onu(request):
 
 
 @login_required
-def fix_port_confict(request, group_id, device_id, port_id):
+def fix_port_conflict(request, group_id, device_id, port_id):
     user_group = get_object_or_404(AbonGroup, pk=group_id)
     device = get_object_or_404(Device, pk=device_id)
     port = get_object_or_404(Port, pk=port_id)