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

@ -2,7 +2,7 @@
# vi:si:et:sw=4:sts=4:ts=4
from django.db.models import Q, Manager
from ox.django.query import QuerySet
from oxdjango.query import QuerySet
def parseCondition(condition, user):

6
pandora/edit/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 edit.models
import ox.django.fields
import oxdjango.fields
class Migration(migrations.Migration):
@ -47,10 +47,10 @@ class Migration(migrations.Migration):
('status', models.CharField(default=b'private', max_length=20)),
('description', models.TextField(default=b'')),
('rightslevel', models.IntegerField(db_index=True, default=0)),
('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)),
('icon', models.ImageField(blank=True, default=None, null=True, upload_to=edit.models.get_icon_path)),
('poster_frames', ox.django.fields.TupleField(default=[], editable=False)),
('poster_frames', oxdjango.fields.TupleField(default=[], editable=False)),
('subscribed_users', models.ManyToManyField(related_name='subscribed_edits', to=settings.AUTH_USER_MODEL)),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='edits', to=settings.AUTH_USER_MODEL)),
],

2
pandora/edit/models.py
View file

@ -11,7 +11,7 @@ from urllib import quote
import tempfile
import ox
from ox.django.fields import DictField, TupleField
from oxdjango.fields import DictField, TupleField
from django.conf import settings
from django.db import models, transaction
from django.db.models import Max

8
pandora/edit/views.py
View file

@ -5,12 +5,12 @@ import os
import re
import ox
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 oxdjango.decorators import login_required_json
from oxdjango.shortcuts import render_to_json_response, get_object_or_404_json, json_response
from django.db import transaction
from django.db.models import Max
from ox.django.http import HttpFileResponse
from ox.django.api import actions
from oxdjango.http import HttpFileResponse
from oxdjango.api import actions
from django.conf import settings
from item import utils