decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects 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/event/managers.py
View file

@ -3,7 +3,7 @@
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

4
pandora/event/migrations/0001_initial.py
View file

@ -3,7 +3,7 @@
from __future__ import unicode_literals
from django.db import migrations, models
import ox.django.fields
import oxdjango.fields
class Migration(migrations.Migration):
@ -26,7 +26,7 @@ class Migration(migrations.Migration):
('name_sort', models.CharField(db_index=True, max_length=255, null=True)),
('name_find', models.TextField(default=b'')),
('wikipediaId', models.CharField(blank=True, max_length=1000)),
('alternativeNames', ox.django.fields.TupleField(default=[])),
('alternativeNames', oxdjango.fields.TupleField(default=[])),
('start', models.CharField(default=b'', max_length=255)),
('startTime', models.BigIntegerField(default=None, null=True)),
('end', models.CharField(default=b'', max_length=255)),

2
pandora/event/models.py
View file

@ -5,7 +5,7 @@ from __future__ import division, with_statement
from django.db import models, transaction
from django.contrib.auth.models import User
import ox
from ox.django import fields
from oxdjango import fields
from annotation.models import Annotation, get_matches, get_super_matches
from item.models import Item

6
pandora/event/views.py
View file

@ -7,10 +7,10 @@ from django.conf import settings
import ox
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 oxdjango.decorators import login_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 changelog.models import add_changelog