Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

removes dojango dependency. #3

Merged
merged 1 commit into from Aug 14, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions README
Expand Up @@ -10,7 +10,6 @@ handler), and adding documentation/examples soon. Until then, you have been
warned!

== Prerequisites ==
* [http://code.google.com/p/dojango/source/browse/trunk/dojango/util/__init__.py#97 json_encode]
* [http://www.jquery.com jQuery 1.3+]
* [http://www.trirand.com/blog/?page_id=6 jqGrid 3.5+]

Expand All @@ -22,7 +21,7 @@ warned!
class ExampleGrid(JqGrid):
model = SomeFancyModel # could also be a queryset
fields = ['id', 'name', 'desc'] # optional
url = reverse('grid_handler')
url = reverse_lazy('grid_handler')
caption = 'My First Grid' # optional
colmodel_overrides = {
'id': { 'editable': False, 'width':10 },
Expand Down
21 changes: 13 additions & 8 deletions jqgrid.py
Expand Up @@ -34,8 +34,12 @@
from django.utils import simplejson as json
from django.utils.encoding import smart_str
from django.http import Http404
from util.json import json_encode
from dojango.util import json
from django.core.serializers.json import DjangoJSONEncoder

def json_encode(data):
encoder = DjangoJSONEncoder()
return encoder.encode(data)

class JqGrid(object):
queryset = None
Expand Down Expand Up @@ -187,12 +191,13 @@ def paginate_items(self, request, items):

def get_json(self, request):
paginator, page, items = self.get_items(request)
return json_encode({
'page': page.number,
'total': paginator.num_pages,
'rows': items,
'records': paginator.count
})
data={
'page': int(page.number),
'total': int(paginator.num_pages),
'rows': [obj for obj in items],
'records': int(paginator.count),
}
return json_encode(data)

def get_default_config(self):
config = {
Expand Down Expand Up @@ -220,7 +225,7 @@ def get_default_config(self):
return config

def get_url(self):
return self.url
return str(self.url)

def get_caption(self):
if self.caption is None:
Expand Down