Merge branch 'core-1.3-updates' into release

[philo.git] / admin / nodes.py

diff --git a/admin/nodes.py b/admin/nodes.py
index a576d44..e2a9c9d 100644 (file)
--- a/admin/nodes.py
+++ b/admin/nodes.py
@@ -1,14 +1,24 @@
 from django.contrib import admin
 from django.contrib import admin

-from philo.admin.base import EntityAdmin, TreeEntityAdmin
+from philo.admin.base import EntityAdmin, TreeEntityAdmin, COLLAPSE_CLASSES

 from philo.models import Node, Redirect, File
 from philo.models import Node, Redirect, File

+from mptt.admin import MPTTModelAdmin

 
 
 class NodeAdmin(TreeEntityAdmin):
        list_display = ('slug', 'view', 'accepts_subpath')
 
 
 class NodeAdmin(TreeEntityAdmin):
        list_display = ('slug', 'view', 'accepts_subpath')

+       raw_id_fields = ('parent',)
+       related_lookup_fields = {
+               'fk': raw_id_fields,
+               'm2m': [],
+               'generic': [['view_content_type', 'view_object_id']]
+       }

        
        def accepts_subpath(self, obj):
                return obj.accepts_subpath
        accepts_subpath.boolean = True
        
        def accepts_subpath(self, obj):
                return obj.accepts_subpath
        accepts_subpath.boolean = True

+       
+       def formfield_for_foreignkey(self, db_field, request, **kwargs):
+               return super(MPTTModelAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs)

 
 
 class ViewAdmin(EntityAdmin):
 
 
 class ViewAdmin(EntityAdmin):


@@ -18,11 +28,19 @@ class ViewAdmin(EntityAdmin):
 class RedirectAdmin(ViewAdmin):
        fieldsets = (
                (None, {
 class RedirectAdmin(ViewAdmin):
        fieldsets = (
                (None, {

-                       'fields': ('target', 'status_code')
+                       'fields': ('target_node', 'url_or_subpath', 'status_code')

                }),
                }),

+               ('Advanced', {
+                       'fields': ('reversing_parameters',),
+                       'classes': COLLAPSE_CLASSES
+               })

        )
        )

-       list_display = ('target', 'status_code')
+       list_display = ('target_url', 'status_code', 'target_node', 'url_or_subpath')

        list_filter = ('status_code',)
        list_filter = ('status_code',)

+       raw_id_fields = ['target_node']
+       related_lookup_fields = {
+               'fk': raw_id_fields
+       }

 
 
 class FileAdmin(ViewAdmin):
 
 
 class FileAdmin(ViewAdmin):