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/changelog/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 item.utils import decode_id

6
pandora/changelog/migrations/0001_initial.py
View file

@ -5,7 +5,7 @@ from __future__ import unicode_literals
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):
@ -23,7 +23,7 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created', models.DateTimeField(auto_now_add=True)),
('type', models.CharField(db_index=True, max_length=255)),
('value', ox.django.fields.DictField(default={})),
('value', oxdjango.fields.DictField(default={})),
],
),
migrations.CreateModel(
@ -31,7 +31,7 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('action', models.CharField(db_index=True, max_length=255)),
('data', ox.django.fields.DictField(default={})),
('data', oxdjango.fields.DictField(default={})),
('created', models.DateTimeField(db_index=True)),
('changeid', models.TextField()),
('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='changelog', to=settings.AUTH_USER_MODEL)),

2
pandora/changelog/models.py
View file

@ -6,7 +6,7 @@ from datetime import datetime
from django.contrib.auth.models import User
from django.db import models
from ox.django import fields
from oxdjango import fields
import ox
import websocket

6
pandora/changelog/views.py
View file

@ -4,10 +4,10 @@ from __future__ import division
import ox
from ox.django.decorators import admin_required_json
from ox.django.shortcuts import render_to_json_response, json_response
from oxdjango.decorators import admin_required_json
from oxdjango.shortcuts import render_to_json_response, json_response
from ox.django.api import actions
from oxdjango.api import actions
from item import utils
from user.decorators import capability_required_json