0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

inline django 1.9 version of ox.django

Browse source
This commit is contained in:
j 2016-02-20 09:06:41 +00:00
commit 051a3578b4
74 changed files with 712 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pandora/item/views.py
View file

@ -18,9 +18,9 @@ from django.conf import settings
from ox.utils import json, ET
from ox.django.decorators import login_required_json
from ox.django.shortcuts import render_to_json_response, get_object_or_404_json, json_response
from ox.django.http import HttpFileResponse
from oxdjango.decorators import login_required_json
from oxdjango.shortcuts import render_to_json_response, get_object_or_404_json, json_response
from oxdjango.http import HttpFileResponse
import ox
import models
@ -33,7 +33,7 @@ from clip.models import Clip
from user.models import has_capability
from changelog.models import add_changelog
from ox.django.api import actions
from oxdjango.api import actions
def _order_query(qs, sort, prefix='sort__'):
@ -241,7 +241,7 @@ def find(request, data):
r = {}
if m:
if not isinstance(m, dict):
m = json.loads(m, object_hook=ox.django.fields.from_json)
m = json.loads(m, object_hook=oxdjango.fields.from_json)
for p in _p:
r[p] = m.get(p)
if 'clip_qs' in query: