diff options
| author |   Sawyer Bergeron <sbergeron@iol.unh.edu> | 2018-01-05 16:07:13 -0500 |
|---|---|---|
| committer | Sawyer Bergeron <sbergeron@iol.unh.edu> | 2018-01-09 15:03:34 -0500 |
| commit | a1df798486c60c911dfb2e6c2c487f7bcb7f6d01 (patch) | |
| tree | 60bec95b5de53c332ab1101240095940e5a4554b /src/account | |
| parent | c81da17a046f1ad81f05de8a242b14ec02cf7c9a (diff) | |
Implement Booking Modification Interface
Jira: PHAROS-330
Users can change start date if it has not already occurred, and
can change end date, purpose, and both installer and scenario.
Standard checks apply similar to when initially creating a booking.
Change-Id: Ibae7fe91a58bd6e0741db065265c05c3823bdc27
Signed-off-by: Sawyer Bergeron <sbergeron@iol.unh.edu>
Diffstat (limited to 'src/account')
| -rw-r--r-- | src/account/migrations/0002_auto_20180109_2002.py (renamed from src/account/migrations/0003_lab.py) | 18 | ||||
| -rw-r--r-- | src/account/migrations/0002_userprofile_email_addr.py | 20 |
2 files changed, 7 insertions, 31 deletions
diff --git a/src/account/migrations/0003_lab.py b/src/account/migrations/0002_auto_20180109_2002.py index c4643c5..5cf8a70 100644 --- a/src/account/migrations/0003_lab.py +++ b/src/account/migrations/0002_auto_20180109_2002.py @@ -1,14 +1,5 @@ -############################################################################## -# Copyright (c) 2016 Sawyer Bergeron and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2018-01-09 15:34 +# Generated by Django 1.10 on 2018-01-09 20:02 from __future__ import unicode_literals from django.conf import settings @@ -20,7 +11,7 @@ class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('account', '0002_userprofile_email_addr'), + ('account', '0001_initial'), ] operations = [ @@ -34,4 +25,9 @@ class Migration(migrations.Migration): ('lab_user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], ), + migrations.AddField( + model_name='userprofile', + name='email_addr', + field=models.CharField(default='email@mail.com', max_length=300), + ), ] diff --git a/src/account/migrations/0002_userprofile_email_addr.py b/src/account/migrations/0002_userprofile_email_addr.py deleted file mode 100644 index bfbed17..0000000 --- a/src/account/migrations/0002_userprofile_email_addr.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2017-12-14 20:37 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('account', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='userprofile', - name='email_addr', - field=models.CharField(default='email@mail.com', max_length=300), - ), - ] |