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/user/decorators.py
View file

@ -4,7 +4,7 @@ try:
from django.contrib.auth.decorators import wraps
except:
from django.utils.functional import wraps
from ox.django.shortcuts import render_to_json_response, json_response
from oxdjango.shortcuts import render_to_json_response, json_response
def capability_required_json(capability):
def capability_required(function=None):

2
pandora/user/managers.py
View file

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# 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
from django.conf import settings
def parseCondition(condition, user):

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

@ -6,7 +6,7 @@ import datetime
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import ox.django.fields
import oxdjango.fields
class Migration(migrations.Migration):
@ -31,7 +31,7 @@ class Migration(migrations.Migration):
('useragent', models.CharField(max_length=4096, null=True)),
('windowsize', models.CharField(max_length=255, null=True)),
('screensize', models.CharField(max_length=255, null=True)),
('info', ox.django.fields.DictField(default={})),
('info', oxdjango.fields.DictField(default={})),
('location', models.CharField(max_length=255, null=True)),
('location_sort', models.CharField(max_length=255, null=True)),
('system', models.CharField(max_length=255, null=True)),
@ -49,8 +49,8 @@ class Migration(migrations.Migration):
('level', models.IntegerField(default=1)),
('files_updated', models.DateTimeField(default=datetime.datetime.now)),
('newsletter', models.BooleanField(default=True)),
('ui', ox.django.fields.DictField(default={})),
('preferences', ox.django.fields.DictField(default={})),
('ui', oxdjango.fields.DictField(default={})),
('preferences', oxdjango.fields.DictField(default={})),
('notes', models.TextField(default=b'')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='profile', to=settings.AUTH_USER_MODEL, unique=True)),
],

2
pandora/user/models.py
View file

@ -11,7 +11,7 @@ from django.contrib.gis.geoip import GeoIP
import ox
from ox.django.fields import DictField
from oxdjango.fields import DictField
from ox.utils import json
from itemlist.models import List, Position

6
pandora/user/views.py
View file

@ -15,12 +15,12 @@ from django.db.models import Max
from django.contrib.auth.models import User, Group
from django.contrib.sessions.models import Session
from ox.django.shortcuts import render_to_json_response, json_response, get_object_or_404_json
from ox.django.decorators import login_required_json
from oxdjango.shortcuts import render_to_json_response, json_response, get_object_or_404_json
from oxdjango.decorators import login_required_json
import ox
from ox.django.api import actions
from oxdjango.api import actions
from item.models import Access, Item
from item import utils
from changelog.models import add_changelog