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/person/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/person/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):
@ -23,7 +23,7 @@ class Migration(migrations.Migration):
('sortsortname', models.CharField(max_length=200)),
('edited', models.BooleanField(default=False)),
('numberofnames', models.IntegerField(default=0)),
('aliases', ox.django.fields.TupleField(default=[])),
('aliases', oxdjango.fields.TupleField(default=[])),
('imdbId', models.CharField(blank=True, max_length=7)),
('wikipediaId', models.CharField(blank=True, max_length=1000)),
],

2
pandora/person/models.py
View file

@ -6,7 +6,7 @@ import unicodedata
from django.db import models
from ox.django import fields
from oxdjango import fields
import ox
from item import utils

6
pandora/person/views.py
View file

@ -5,10 +5,10 @@ from __future__ import division
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
import models