fix urls

devapp/urls.py

@@ -9,18 +9,18 @@ urlpatterns = [
     path('fix_onu/', views.fix_onu, name='fix_onu'),
     path('<int:group_id>/', views.DevicesListView.as_view(), name='devs'),
     path('<int:group_id>/add/', views.DeviceCreateView.as_view(), name='add'),
-    path('<int>/<int:device_id>/', views.devview, name='view'),
-    path('<int>/<int:device_id>/del/', views.DeviceDeleteView.as_view(), name='del'),
+    path('<int:group_id>/<int:device_id>/', views.devview, name='view'),
+    path('<int:group_id>/<int:device_id>/del/', views.DeviceDeleteView.as_view(), name='del'),
     path('<int:group_id>/<int:device_id>/add/', views.add_single_port, name='add_port'),
     path('<int:group_id>/<int:device_id>/edit/', views.DeviceUpdate.as_view(), name='edit'),
     path('<int:group_id>/<int:device_id>/edit_extra/', views.DeviceUpdateExtra.as_view(), name='extra_data_edit'),
-    path('<int>/<int:device_id>/ports/', views.manage_ports, name='manage_ports'),
+    path('<int:group_id>/<int:device_id>/ports/', views.manage_ports, name='manage_ports'),
     path('<int:group_id>/<int:device_id>/ports/<int:port_id>/fix_port_conflict/', views.fix_port_conflict,
         name='fix_port_conflict'),
     path('<int:group_id>/<int:device_id>/ports/<int:port_id>/show_subscriber_on_port/',
         views.ShowSubscriberOnPort.as_view(), name='show_subscriber_on_port'),
-    path('<int>/<int:device_id>/ports_add/', views.add_ports, name='add_ports'),
-    path('<int>/<int:device_id>/register_device/', views.register_device, name='dev_register'),
+    path('<int:group_id>/<int:device_id>/ports_add/', views.add_ports, name='add_ports'),
+    path('<int:group_id>/<int:device_id>/register_device/', views.register_device, name='dev_register'),
     re_path('^(\d+)/(?P<device_id>\d+)/(?P<portid>\d+)_(?P<status>[0-1]{1})$', views.toggle_port, name='port_toggle'),
     path('<int:group_id>/<int:device_id>/<int:portid>/del/', views.delete_single_port, name='del_port'),
     path('<int:group_id>/<int:device_id>/<int:portid>/edit/', views.edit_single_port, name='edit_port'),

devapp/views.py

@@ -236,7 +236,7 @@ class DeviceUpdateExtra(UpdateView):
 
 @login_required
 @permission_required('devapp.change_device')
-def manage_ports(request, device_id):
+def manage_ports(request, group_id: int, device_id: int):
     device = ports = None
     try:
         device = Device.objects.get(pk=device_id)
@@ -281,7 +281,7 @@ class ShowSubscriberOnPort(global_base_views.RedirectWhenErrorMixin, DetailView)
 
 @login_required
 @permission_required('devapp.add_port')
-def add_ports(request, device_id):
+def add_ports(request, group_id: int, device_id: int):
     class TempPort:
         def __init__(self, pid, text, status, from_db, pk=None):
             self.pid = pid
@@ -429,7 +429,7 @@ def add_single_port(request, group_id, device_id):
 
 @login_required
 @permission_required('devapp.can_view_device')
-def devview(request, device_id):
+def devview(request, group_id: int, device_id: int):
     ports, manager = None, None
     device = get_object_or_404(Device, id=device_id)
 
@@ -719,7 +719,7 @@ class DevicesGetListView(global_base_views.SecureApiView):
 
 @login_required
 @json_view
-def register_device(request, device_id: str):
+def register_device(request, group_id: int, device_id: int):
     def format_msg(msg: str, icon: str):
         return ' '.join((
             '<span class="glyphicon glyphicon-%s"></span>' % icon,