forked from 0x2620/pandora
inline django 1.9 version of ox.django
This commit is contained in:
parent
970f3f605d
commit
051a3578b4
74 changed files with 712 additions and 138 deletions
|
|
@ -2,7 +2,7 @@
|
|||
# vi:si:et:sw=4:sts=4:ts=4
|
||||
import unicodedata
|
||||
from django.db.models import Q, Manager
|
||||
from ox.django.query import QuerySet
|
||||
from oxdjango.query import QuerySet
|
||||
|
||||
from item.utils import decode_id
|
||||
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@ import unicodedata
|
|||
import ox
|
||||
from ox.utils import json
|
||||
|
||||
from ox.django.decorators import admin_required_json
|
||||
from ox.django.shortcuts import render_to_json_response, get_object_or_404_json, json_response
|
||||
from oxdjango.decorators import admin_required_json
|
||||
from oxdjango.shortcuts import render_to_json_response, get_object_or_404_json, json_response
|
||||
|
||||
from ox.django.api import actions
|
||||
from oxdjango.api import actions
|
||||
from item import utils
|
||||
from user.decorators import capability_required_json
|
||||
from changelog.models import add_changelog
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue