Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions layers/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import os
from queryset_sequence import QuerySetSequence
import requests
from reversion.admin import VersionAdmin

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed in madrona-portal PR. See Ecotrust/madrona-portal#69 .

from .fixture_contract import validate_node_shape
from .fixture_import import import_fixture_rows
from .models import *
Expand Down Expand Up @@ -236,7 +237,7 @@ def export_theme_details(self, request, queryset):
return response


class ThemeAdmin(ImportExportMixin,admin.ModelAdmin):
class ThemeAdmin(ImportExportMixin, VersionAdmin):
fixture_import_session_key = "layers.theme_fixture_import_rows"
list_display = ('display_name', 'name', 'order', 'date_modified', 'is_top_theme', 'primary_site', 'preview_site')
search_fields = ['display_name', 'name',]
Expand Down Expand Up @@ -1063,7 +1064,7 @@ def export_layer_details(self, request, queryset):
return response


class LayerAdmin(ImportExportMixin, nested_admin.NestedModelAdmin):
class LayerAdmin(ImportExportMixin, nested_admin.NestedModelAdmin, VersionAdmin):
fixture_import_session_key = "layers.fixture_import_rows"

def values_match(self, current_value, new_value):
Expand Down Expand Up @@ -1595,7 +1596,7 @@ class Media:
'all': ("admin/css/layer_http_status.css","admin/css/layer_admin.css",)
}

class LookupInfoAdmin(admin.ModelAdmin):
class LookupInfoAdmin(VersionAdmin):
list_display = ('value', 'description', 'color', 'stroke_color', 'dashstyle', 'fill', 'graphic')

# class ChildOrderForm(forms.ModelForm):
Expand All @@ -1607,7 +1608,7 @@ class LookupInfoAdmin(admin.ModelAdmin):
# list_display = ('parent_theme', 'content_type', 'object_id', 'order')
# form = ChildOrderForm

class AttributeInfoAdmin(admin.ModelAdmin):
class AttributeInfoAdmin(VersionAdmin):
list_display = ('display_name', 'field_name', 'field_label', 'precision', 'order', 'preserve_format')
search_fields = ('display_name', 'field_name', 'field_label')

Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ django-autocomplete-light
django-querysetsequence
django-import-export
django-nested-admin
django-reversion
celery
Loading