Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Moved forward to 6.7.2.dev0 the changes to rename class ScheduledSess…
…ion to the more correct (but unfortunately also cumbersome) SchedTimeSessAssignment, and rename reverse relationships involving this class appropriately. Accompanying changes in javascript and templates. Migrations to match. - Legacy-Id: 10297
- Loading branch information
Showing
32 changed files
with
385 additions
and
278 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
# -*- coding: utf-8 -*- | ||
from __future__ import unicode_literals | ||
|
||
from django.db import models, migrations | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('meeting', '0011_ietf92_meetings'), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterField( | ||
model_name='scheduledsession', | ||
name='session', | ||
field=models.ForeignKey(related_name='timeslotassignments', default=None, to='meeting.Session', help_text='Scheduled session.', null=True), | ||
preserve_default=True, | ||
), | ||
migrations.AlterField( | ||
model_name='scheduledsession', | ||
name='timeslot', | ||
field=models.ForeignKey(related_name='sessionassignments', to='meeting.TimeSlot'), | ||
preserve_default=True, | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
# -*- coding: utf-8 -*- | ||
from __future__ import unicode_literals | ||
|
||
from django.db import models, migrations | ||
import datetime | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('meeting', '0012_auto_20151026_1406'), | ||
] | ||
|
||
operations = [ | ||
migrations.CreateModel( | ||
name='Dummy', | ||
fields=[ | ||
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), | ||
('modified', models.DateTimeField(default=datetime.datetime.now)), | ||
('notes', models.TextField(blank=True)), | ||
('badness', models.IntegerField(default=0, null=True, blank=True)), | ||
('pinned', models.BooleanField(default=False, help_text=b'Do not move session during automatic placement.')), | ||
('extendedfrom', models.ForeignKey(default=None, to='self', help_text='Timeslot this session is an extension of.', null=True)), | ||
('schedule', models.ForeignKey(related_name='assignments', to='meeting.Schedule')), | ||
('session', models.ForeignKey(related_name='timeslotassignments', default=None, to='meeting.Session', help_text='Scheduled session.', null=True)), | ||
('timeslot', models.ForeignKey(related_name='sessionassignments', to='meeting.TimeSlot')), | ||
], | ||
options={ | ||
'ordering': ['timeslot__time', 'timeslot__type__slug', 'session__group__parent__name', 'session__group__acronym', 'session__name'], | ||
}, | ||
bases=(models.Model,), | ||
), | ||
migrations.AlterField( | ||
model_name='timeslot', | ||
name='sessions', | ||
field=models.ManyToManyField(related_name='slots', to='meeting.Session', through='meeting.Dummy', blank=True, help_text='Scheduled session, if any.', null=True), | ||
preserve_default=True, | ||
), | ||
] |
Oops, something went wrong.