Merge branch 'release' into gilbert

[philo.git] / contrib / gilbert / plugins / models.py

diff --git a/contrib/gilbert/plugins/models.py b/contrib/gilbert/plugins/models.py
index e3d559a..ee13989 100644 (file)
--- a/contrib/gilbert/plugins/models.py
+++ b/contrib/gilbert/plugins/models.py
@@ -1,6 +1,7 @@
 from django.conf import settings
 from django.contrib.admin.util import lookup_field, label_for_field, display_for_field, NestedObjects
 from django.core.exceptions import PermissionDenied
 from django.conf import settings
 from django.contrib.admin.util import lookup_field, label_for_field, display_for_field, NestedObjects
 from django.core.exceptions import PermissionDenied

+from django.db import router

 from django.db.models import Q
 from django.db.models.fields.related import ManyToOneRel
 from django.db.models.fields.files import FieldFile, ImageFieldFile, FileField
 from django.db.models import Q
 from django.db.models.fields.related import ManyToOneRel
 from django.db.models.fields.files import FieldFile, ImageFieldFile, FileField


@@ -10,7 +11,7 @@ from django.utils import simplejson as json
 from django.utils.encoding import smart_unicode
 from .base import Plugin
 from ..extdirect import ext_action, ext_method
 from django.utils.encoding import smart_unicode
 from .base import Plugin
 from ..extdirect import ext_action, ext_method

-import operator, staticmedia
+import operator

 
 
 @ext_action(name='models')
 
 
 @ext_action(name='models')


@@ -24,8 +25,8 @@ class Models(Plugin):
        @property
        def index_js_urls(self):
                return super(Models, self).index_js_urls + [
        @property
        def index_js_urls(self):
                return super(Models, self).index_js_urls + [

-                       staticmedia.url('gilbert/extjs/examples/ux/SearchField.js'),
-                       staticmedia.url('gilbert/plugins/models.js'),
+                       settings.STATIC_URL + 'gilbert/extjs/examples/ux/SearchField.js',
+                       settings.STATIC_URL + 'gilbert/plugins/models.js',

                ]
        
        @property
                ]
        
        @property


@@ -120,6 +121,7 @@ class ModelAdmin(Plugin):
        @property
        def data_columns_spec(self):
                spec = []
        @property
        def data_columns_spec(self):
                spec = []

+               

                for field_name in self.data_columns:
                        column = {
                                'dataIndex': field_name,
                for field_name in self.data_columns:
                        column = {
                                'dataIndex': field_name,


@@ -132,6 +134,8 @@ class ModelAdmin(Plugin):
                                column['sortable'] = True
                        if field_name in self.data_editable_columns:
                                column['editable'] = True
                                column['sortable'] = True
                        if field_name in self.data_editable_columns:
                                column['editable'] = True

+                       if field_name in [field.name for field in self.model_meta.fields if isinstance(field.rel, ManyToOneRel)]:
+                               column['xtype'] = 'foreignkeycolumn'

                        spec.append(column)
                return spec
        
                        spec.append(column)
                return spec
        


@@ -375,9 +379,8 @@ class ModelAdmin(Plugin):
                        pks = [pks]
                objs = [self.model._default_manager.all().get(pk=pk) for pk in pks]
                
                        pks = [pks]
                objs = [self.model._default_manager.all().get(pk=pk) for pk in pks]
                

-               collector = NestedObjects()
-               
-               for obj in objs:
-                       obj._collect_sub_objects(collector)
+               using = router.db_for_write(self.model)
+               collector = NestedObjects(using=using)
+               collector.collect(objs)

                
                return collector.nested(self.data_serialize_model_instance)
\ No newline at end of file
                
                return collector.nested(self.data_serialize_model_instance)
\ No newline at end of file