Skip to content

Commit

Permalink
Moved Checkin model to pretixbase
Browse files Browse the repository at this point in the history
  • Loading branch information
raphaelm committed Dec 8, 2016
1 parent 3c96e63 commit fa0bd5e
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 2 deletions.
29 changes: 29 additions & 0 deletions src/pretix/base/migrations/0049_checkin.py
Original file line number Diff line number Diff line change
@@ -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)
]
1 change: 1 addition & 0 deletions src/pretix/base/models/__init__.py
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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)
]
3 changes: 1 addition & 2 deletions src/pretix/plugins/pretixdroid/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@
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
Expand Down

0 comments on commit fa0bd5e

Please sign in to comment.