comment out filter, revert to old version of django on server
This commit is contained in:
parent
f710ea8088
commit
452ea759ca
|
@ -1,8 +1,9 @@
|
||||||
from django.contrib.gis import admin
|
from django.contrib.gis import admin
|
||||||
from models import *
|
from models import *
|
||||||
from django import forms
|
from django import forms
|
||||||
from django.contrib.admin import SimpleListFilter
|
#from django.contrib.admin import SimpleListFilter
|
||||||
|
|
||||||
|
'''
|
||||||
class FeatureTypeFilter(SimpleListFilter):
|
class FeatureTypeFilter(SimpleListFilter):
|
||||||
# Human-readable title which will be displayed in the
|
# Human-readable title which will be displayed in the
|
||||||
# right admin sidebar just above the filter options.
|
# right admin sidebar just above the filter options.
|
||||||
|
@ -37,7 +38,7 @@ class FeatureTypeFilter(SimpleListFilter):
|
||||||
# to decide how to filter the queryset.
|
# to decide how to filter the queryset.
|
||||||
val = self.value()
|
val = self.value()
|
||||||
return queryset.filter(feature_type=val)
|
return queryset.filter(feature_type=val)
|
||||||
|
'''
|
||||||
|
|
||||||
class FeatureNamesInline(admin.StackedInline):
|
class FeatureNamesInline(admin.StackedInline):
|
||||||
model = Name
|
model = Name
|
||||||
|
@ -65,15 +66,15 @@ class FeatureAdmin(admin.OSMGeoAdmin):
|
||||||
inlines = [FeatureNamesInline]
|
inlines = [FeatureNamesInline]
|
||||||
list_display = ('__unicode__', 'feature_type_name', 'time_start', 'time_end',)
|
list_display = ('__unicode__', 'feature_type_name', 'time_start', 'time_end',)
|
||||||
list_per_page = 12
|
list_per_page = 12
|
||||||
list_filter = (FeatureTypeFilter,)
|
# list_filter = (FeatureTypeFilter,)
|
||||||
# openlayers_url = 'http://openlayers.org/dev/OpenLayers.js'
|
openlayers_url = 'http://openlayers.org/dev/OpenLayers.js'
|
||||||
openlayers_img_path = None
|
openlayers_img_path = None
|
||||||
form = featuresForm
|
form = featuresForm
|
||||||
# map_template = 'gis/admin/osm.html'
|
# map_template = 'gis/admin/osm.html'
|
||||||
# default_lon = 72.855211097628413
|
# default_lon = 72.855211097628413
|
||||||
# default_lat = 19.415775291486027
|
# default_lat = 19.415775291486027
|
||||||
# default_zoom = 4
|
# default_zoom = 4
|
||||||
extra_js = ['http://openstreetmap.org/openlayers/OpenStreetMap.js', 'http://openlayers.org/dev/OpenLayers.js']
|
# extra_js = ['http://openstreetmap.org/openlayers/OpenStreetMap.js', 'http://openlayers.org/dev/OpenLayers.js']
|
||||||
|
|
||||||
class FeatureTypeAdmin(admin.ModelAdmin):
|
class FeatureTypeAdmin(admin.ModelAdmin):
|
||||||
list_display = ('code', 'name', 'description', 'feature_class',)
|
list_display = ('code', 'name', 'description', 'feature_class',)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user