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/itemlist/managers.py
View file

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

8
pandora/itemlist/migrations/0001_initial.py
View file

@ -6,7 +6,7 @@ from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import itemlist.models
import ox.django.fields
import oxdjango.fields
class Migration(migrations.Migration):
@ -27,13 +27,13 @@ class Migration(migrations.Migration):
('modified', models.DateTimeField(auto_now=True)),
('name', models.CharField(max_length=255)),
('status', models.CharField(default=b'private', max_length=20)),
('query', ox.django.fields.DictField(default={b'static': True})),
('query', oxdjango.fields.DictField(default={b'static': True})),
('type', models.CharField(default=b'static', max_length=255)),
('description', models.TextField(default=b'')),
('icon', models.ImageField(blank=True, default=None, upload_to=itemlist.models.get_icon_path)),
('view', models.TextField(default=itemlist.models.get_listview)),
('sort', ox.django.fields.TupleField(default=itemlist.models.get_listsort, editable=False)),
('poster_frames', ox.django.fields.TupleField(default=[], editable=False)),
('sort', oxdjango.fields.TupleField(default=itemlist.models.get_listsort, editable=False)),
('poster_frames', oxdjango.fields.TupleField(default=[], editable=False)),
('numberofitems', models.IntegerField(default=0)),
],
),

2
pandora/itemlist/models.py
View file

@ -12,7 +12,7 @@ from django.contrib.auth.models import User
from django.conf import settings
import ox
from ox.django.fields import DictField, TupleField
from oxdjango.fields import DictField, TupleField
from archive import extract
import managers

8
pandora/itemlist/views.py
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