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

2
pandora/document/managers.py
View file

@ -3,7 +3,7 @@
from django.db.models import Q, Manager
import ox
from ox.django.query import QuerySet
from oxdjango.query import QuerySet
def parseCondition(condition, user, item=None):
'''

8
pandora/document/views.py
View file

@ -6,10 +6,10 @@ from glob import glob
import ox
from ox.utils import json
from ox.django.api import actions
from ox.django.decorators import login_required_json
from ox.django.http import HttpFileResponse
from ox.django.shortcuts import render_to_json_response, get_object_or_404_json, json_response, HttpErrorJson
from oxdjango.api import actions
from oxdjango.decorators import login_required_json
from oxdjango.http import HttpFileResponse
from oxdjango.shortcuts import render_to_json_response, get_object_or_404_json, json_response, HttpErrorJson
from django import forms
from django.db.models import Sum