Merged in heroku (pull request #27)

Update master brance to Heroku
This commit is contained in:
Tom Price
2015-04-25 16:16:51 +01:00
6 changed files with 90 additions and 9 deletions

View File

@@ -0,0 +1,26 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('RIGS', '0021_auto_20150420_1155'),
]
operations = [
migrations.AlterField(
model_name='event',
name='collector',
field=models.CharField(max_length=255, null=True, verbose_name=b'Collected by', blank=True),
preserve_default=True,
),
migrations.AlterField(
model_name='event',
name='purchase_order',
field=models.CharField(max_length=255, null=True, verbose_name=b'PO', blank=True),
preserve_default=True,
),
]

View File

@@ -57,7 +57,7 @@ urlpatterns = patterns('',
name='venue_update'),
# Rigboard
url(r'^rigboard/$', rigboard.RigboardIndex.as_view(), name='rigboard'),
url(r'^rigboard/$', login_required(rigboard.RigboardIndex.as_view()), name='rigboard'),
url(r'^rigboard/calendar/$', login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'),
url(r'^rigboard/archive/$', RedirectView.as_view(pattern_name='event_archive')),