Browse Source

fix tunnel admin

Élie Bouttier 7 years ago
parent
commit
43239b771b
1 changed files with 4 additions and 4 deletions
  1. 4 4
      services/admin.py

+ 4 - 4
services/admin.py

@@ -16,6 +16,8 @@ from django.contrib.postgres.aggregates import StringAgg
 from django.db import connection
 from django.db import connection
 from django.core.cache import cache
 from django.core.cache import cache
 
 
+from djgeojson.views import GeoJSONLayerView
+
 from djadhere.utils import get_active_filter
 from djadhere.utils import get_active_filter
 from adhesions.models import Adhesion
 from adhesions.models import Adhesion
 from .models import Service, ServiceType, IPPrefix, IPResource, Route, Tunnel, ServiceAllocation, Antenna, AntennaAllocation, Allocation
 from .models import Service, ServiceType, IPPrefix, IPResource, Route, Tunnel, ServiceAllocation, Antenna, AntennaAllocation, Allocation
@@ -342,7 +344,7 @@ class RouteAdmin(admin.ModelAdmin):
         return False
         return False
 
 
 
 
-class TunnelAdmin(RouteAdmin):
+class TunnelAdmin(admin.ModelAdmin):
     list_display = ('name', 'description', 'created', 'active')
     list_display = ('name', 'description', 'created', 'active')
     list_filter = (
     list_filter = (
         ActiveTunnelFilter,
         ActiveTunnelFilter,
@@ -417,13 +419,11 @@ class AntennaAdmin(geo_admin.OSMGeoAdmin):
         return False
         return False
 
 
     def get_urls(self):
     def get_urls(self):
-        urls = super().get_urls()
-        from djgeojson.views import GeoJSONLayerView
         my_urls = [
         my_urls = [
             url(r'^map/$', self.admin_site.admin_view(self.map_view, cacheable=True), name='antenna-map'),
             url(r'^map/$', self.admin_site.admin_view(self.map_view, cacheable=True), name='antenna-map'),
             url(r'^map/data.json$', self.admin_site.admin_view(GeoJSONLayerView.as_view(model=Antenna, geometry_field='position')), name='antenna-map-data'),
             url(r'^map/data.json$', self.admin_site.admin_view(GeoJSONLayerView.as_view(model=Antenna, geometry_field='position')), name='antenna-map-data'),
         ]
         ]
-        return my_urls + urls
+        return my_urls + super().get_urls()
 
 
     def map_view(self, request):
     def map_view(self, request):
         return TemplateResponse(request, 'services/antenna_map.html', {
         return TemplateResponse(request, 'services/antenna_map.html', {