git.ithinksw.org
/
philo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Corrected ExtMethod keyword generation to eliminate unicode. Added capfirst use for...
[philo.git]
/
contrib
/
gilbert
/
plugins
/
models.py
diff --git
a/contrib/gilbert/plugins/models.py
b/contrib/gilbert/plugins/models.py
index
5217df3
..
ae97ee7
100644
(file)
--- a/
contrib/gilbert/plugins/models.py
+++ b/
contrib/gilbert/plugins/models.py
@@
-1,15
+1,16
@@
-import operator
-from django.forms.models import ModelForm, modelform_factory
+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.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
-from django.contrib.admin.util import lookup_field, label_for_field, display_for_field, NestedObjects
+from django.forms.models import ModelForm, modelform_factory
+from django.template.defaultfilters import capfirst
+from django.utils import simplejson as json
from django.utils.encoding import smart_unicode
from django.utils.encoding import smart_unicode
-import staticmedia
from .base import Plugin
from ..extdirect import ext_action, ext_method
from .base import Plugin
from ..extdirect import ext_action, ext_method
-from django.core.exceptions import PermissionDenied
-from django.utils import simplejson as json
+import operator, staticmedia
@ext_action(name='models')
@ext_action(name='models')
@@
-126,7
+127,7
@@
class ModelAdmin(Plugin):
'editable': False,
}
header, attr = label_for_field(field_name, self.model, model_admin=self, return_attr=True)
'editable': False,
}
header, attr = label_for_field(field_name, self.model, model_admin=self, return_attr=True)
- column['header'] =
header
+ column['header'] =
capfirst(header)
if (field_name in self.sortable_fields) or (getattr(attr, 'admin_order_field', None) in self.sortable_fields):
column['sortable'] = True
if field_name in self.data_editable_columns:
if (field_name in self.sortable_fields) or (getattr(attr, 'admin_order_field', None) in self.sortable_fields):
column['sortable'] = True
if field_name in self.data_editable_columns:
@@
-170,17
+171,20
@@
class ModelAdmin(Plugin):
raise PermissionDenied
return self.model._default_manager.all()
raise PermissionDenied
return self.model._default_manager.all()
+ def queryset(self, request):
+ return self.model._default_manager.get_query_set()
+
@ext_method
def filter(self, request, **kwargs):
if not self.has_read_permission(request):
raise PermissionDenied
@ext_method
def filter(self, request, **kwargs):
if not self.has_read_permission(request):
raise PermissionDenied
- return self.
model._default_manager.all(
).filter(**kwargs)
+ return self.
queryset(request
).filter(**kwargs)
@ext_method
def get(self, request, **kwargs):
if not self.has_read_permission(request):
raise PermissionDenied
@ext_method
def get(self, request, **kwargs):
if not self.has_read_permission(request):
raise PermissionDenied
- return self.
model._default_manager.all(
).values().get(**kwargs)
+ return self.
queryset(request
).values().get(**kwargs)
@property
def form_class(self):
@property
def form_class(self):