From fa0bd5e89e2fe1e3fb546fe2a3ec1856c6c4e2e6 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Thu, 8 Dec 2016 17:51:23 +0100 Subject: [PATCH] Moved Checkin model to pretixbase --- src/pretix/base/migrations/0049_checkin.py | 29 +++++++++++++++++++ src/pretix/base/models/__init__.py | 1 + .../models.py => base/models/checkin.py} | 0 .../migrations/0002_auto_20161208_1644.py | 26 +++++++++++++++++ src/pretix/plugins/pretixdroid/views.py | 3 +- 5 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 src/pretix/base/migrations/0049_checkin.py rename src/pretix/{plugins/pretixdroid/models.py => base/models/checkin.py} (100%) create mode 100644 src/pretix/plugins/pretixdroid/migrations/0002_auto_20161208_1644.py diff --git a/src/pretix/base/migrations/0049_checkin.py b/src/pretix/base/migrations/0049_checkin.py new file mode 100644 index 0000000000..74fbbf4a6c --- /dev/null +++ b/src/pretix/base/migrations/0049_checkin.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.4 on 2016-12-08 16:47 +from __future__ import unicode_literals + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('pretixbase', '0048_auto_20161129_1330'), + ('pretixdroid', '0002_auto_20161208_1644'), + ] + + state_operations = [ + migrations.CreateModel( + name='Checkin', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('datetime', models.DateTimeField(auto_now_add=True)), + ('position', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='pretixdroid_checkins', to='pretixbase.OrderPosition')), + ], + ), + ] + + operations = [ + migrations.SeparateDatabaseAndState(state_operations=state_operations) + ] diff --git a/src/pretix/base/models/__init__.py b/src/pretix/base/models/__init__.py index a6cd2605f7..d980f55df2 100644 --- a/src/pretix/base/models/__init__.py +++ b/src/pretix/base/models/__init__.py @@ -1,5 +1,6 @@ from .auth import U2FDevice, User from .base import CachedFile, LoggedModel, cachedfile_name +from .checkin import Checkin from .event import Event, EventLock, EventPermission, EventSetting from .invoices import Invoice, InvoiceLine, invoice_filename from .items import ( diff --git a/src/pretix/plugins/pretixdroid/models.py b/src/pretix/base/models/checkin.py similarity index 100% rename from src/pretix/plugins/pretixdroid/models.py rename to src/pretix/base/models/checkin.py diff --git a/src/pretix/plugins/pretixdroid/migrations/0002_auto_20161208_1644.py b/src/pretix/plugins/pretixdroid/migrations/0002_auto_20161208_1644.py new file mode 100644 index 0000000000..c5a1c2b9a9 --- /dev/null +++ b/src/pretix/plugins/pretixdroid/migrations/0002_auto_20161208_1644.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.4 on 2016-12-08 16:44 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('pretixdroid', '0001_initial'), + ] + + database_operations = [ + migrations.AlterModelTable('Checkin', 'pretixbase_checkin') + ] + + state_operations = [ + migrations.DeleteModel('Checkin') + ] + + operations = [ + migrations.SeparateDatabaseAndState( + database_operations=database_operations, + state_operations=state_operations) + ] diff --git a/src/pretix/plugins/pretixdroid/views.py b/src/pretix/plugins/pretixdroid/views.py index 5b3ab536d6..a3c9045b3c 100644 --- a/src/pretix/plugins/pretixdroid/views.py +++ b/src/pretix/plugins/pretixdroid/views.py @@ -12,10 +12,9 @@ from django.utils.decorators import method_decorator from django.views.decorators.csrf import csrf_exempt from django.views.generic import TemplateView, View -from pretix.base.models import Event, Order, OrderPosition +from pretix.base.models import Checkin, Event, Order, OrderPosition from pretix.control.permissions import EventPermissionRequiredMixin from pretix.helpers.urls import build_absolute_uri -from pretix.plugins.pretixdroid.models import Checkin logger = logging.getLogger('pretix.plugins.pretixdroid') API_VERSION = 2