-
Notifications
You must be signed in to change notification settings - Fork 7
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature/kak/multiple event destinations#1107 #1128
Merged
flibbertigibbet
merged 4 commits into
azavea:tours
from
flibbertigibbet:feature/kak/multiple-event-destinations#1107
Aug 21, 2019
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file removed
BIN
-26.6 KB
python/cac_tripplanner/default_media/events/CrazyPhiladelphiaEddie_3.jpg
Binary file not shown.
Binary file removed
BIN
-66.7 KB
python/cac_tripplanner/default_media/events/CrazyPhiladelphiaEddie_5.jpg
Binary file not shown.
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
48 changes: 48 additions & 0 deletions
48
python/cac_tripplanner/destinations/migrations/0047_allow_multiple_event_destinations.py
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,48 @@ | ||
# -*- coding: utf-8 -*- | ||
# Generated by Django 1.11.22 on 2019-07-29 18:05 | ||
from __future__ import unicode_literals | ||
|
||
from django.db import migrations, models | ||
|
||
|
||
def move_event_destinations_to_multiple(apps, schema_editor): | ||
"""Move event destination to new set of multiple destinations.""" | ||
Event = apps.get_model('destinations', 'Event') | ||
events = Event.objects.all() | ||
for event in events: | ||
if event.destination: | ||
event.destinations.add(event.destination) | ||
event.save() | ||
|
||
|
||
def move_event_destinations_to_single(apps, schema_editor): | ||
"""Move event destination from new set of multiple destinations. | ||
|
||
Use the first destination for the event. | ||
""" | ||
Event = apps.get_model('destinations', 'Event') | ||
events = Event.objects.all() | ||
for event in events: | ||
if event.destinations.count() > 0: | ||
event.destination = event.destinations.first() | ||
event.save() | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('destinations', '0046_prepopulate_events'), | ||
] | ||
|
||
operations = [ | ||
migrations.AddField( | ||
model_name='event', | ||
name='destinations', | ||
field=models.ManyToManyField(blank=True, to='destinations.Destination'), | ||
), | ||
migrations.RunPython(move_event_destinations_to_multiple, move_event_destinations_to_single), | ||
migrations.RemoveField( | ||
model_name='event', | ||
name='destination', | ||
), | ||
] |
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is the first one special, or should any Watershed Alliance destination cause the event to get the label? This could also be something like
event.destinations.filter(watershed_alliance=True).exists()
, right?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is an interim fix that should be revisited with #1127, when we have answers on how these properties should be assigned (does it apply if any destination has the property? if all do?).