inline django 1.9 version of ox.django

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

View file

@ -8,13 +8,13 @@ from django.db.models import Max, Sum
from django.db import transaction
from django.conf import settings
from ox.utils import json
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 models
from ox.django.api import actions
from oxdjango.api import actions
from item import utils
from item.models import Item
from user.tasks import update_numberoflists