LoCo Team Portal

Merge lp://staging/~ris/loco-team-portal/fix-552762 into lp://staging/loco-team-portal

fix-552762
Merge into 0.2

Proposed by Robert Sajdok on 2013-01-09

Status:

Needs review

Proposed branch:

lp://staging/~ris/loco-team-portal/fix-552762

Merge into:

lp://staging/loco-team-portal

Diff against target:

1729 lines (+1420/-11) (has conflicts)

14 files modified

Makefile (+1/-1)
loco_directory/events/forms.py (+101/-5)
loco_directory/events/migrations/0010_auto__chg_field_attendee_guests.py (+184/-0)
loco_directory/events/migrations/0011_auto__add_field_teamevent_created_by.py (+185/-0)
loco_directory/events/migrations/0012_auto__add_teameventvenue.py (+196/-0)
loco_directory/events/migrations/0013_historical_venue.py (+195/-0)
loco_directory/events/migrations/0014_auto__del_field_teamevent_venue.py (+190/-0)
loco_directory/events/models.py (+10/-2)
loco_directory/events/views.py (+114/-3)
loco_directory/media/css/venues.css (+10/-0)
loco_directory/media/js/jquery.formset.js (+170/-0)
loco_directory/media/js/venues.js (+3/-0)
loco_directory/templates/events/team_event_new.html (+26/-0)
loco_directory/templates/events/team_event_update.html (+35/-0)

Text conflict in loco_directory/events/forms.py
Conflict adding file loco_directory/events/migrations/0010_auto__chg_field_attendee_guests.py.  Moved existing file to loco_directory/events/migrations/0010_auto__chg_field_attendee_guests.py.moved.
Conflict adding file loco_directory/events/migrations/0011_auto__add_field_teamevent_created_by.py.  Moved existing file to loco_directory/events/migrations/0011_auto__add_field_teamevent_created_by.py.moved.
Text conflict in loco_directory/events/views.py
Text conflict in loco_directory/templates/events/team_event_new.html
Text conflict in loco_directory/templates/events/team_event_update.html

To merge this branch:

bzr merge lp://staging/~ris/loco-team-portal/fix-552762

Medium

In Progress

Link a bug report

Reviewer	Date Requested	Status
Adnane Belmadiaf		Needs Fixing on 2013-04-01
Chris Johnston	2013-01-09	Needs Fixing on 2013-01-09
Review via email: mp+142553@code.staging.launchpad.net

Revision history for this message

Chris Johnston (cjohnston) wrote on 2013-01-09:

Please clean up the merge conflicts.

review: Needs Fixing

Revision history for this message

Robert Sajdok (ris) wrote on 2013-01-09:

> Please clean up the merge conflicts.
How can I do this on my local working directory?

Revision history for this message

Robert Sajdok (ris) wrote on 2013-01-20:

I've done this way:
$ bzr merge https://code.launchpad.net/~ltp-devs/loco-team-portal/0.2
I am working with conflicts.

lp://staging/~ris/loco-team-portal/fix-552762 updated on 2013-02-07

555. By Robert Sajdok on 2013-02-07: Resolve conflicts

Revision history for this message

Robert Sajdok (ris) wrote on 2013-02-07:

> Please clean up the merge conflicts.
done, please review

Revision history for this message

Adnane Belmadiaf (daker) wrote on 2013-02-12:

> done, please review
Thanks Ris for your work, i'll take a look at your MP this week.

Revision history for this message

Robert Sajdok (ris) wrote on 2013-03-10:

Any progress?

Revision history for this message

Adnane Belmadiaf (daker) wrote on 2013-04-01:

Hi Robert, this MP still need more work, we need to add some lines of codes to keep the relation between the venues and the events, i mean this line :

226 + # Deleting field 'TeamEvent.venue'
227 + db.delete_column('events_teamevent', 'venue_id')

we need to store in memory all venues/events relatiosn before then create them once the new table TeamEventVenue is created.

review: Needs Fixing

lp://staging/~ris/loco-team-portal/fix-552762 updated on 2013-06-29

556. By Robert Sajdok on 2013-06-29: South Changes for team event venue.

Revision history for this message

Robert Sajdok (ris) wrote on 2013-06-29:

> Hi Robert, this MP still need more work, we need to add some lines of codes to
> keep the relation between the venues and the events, i mean this line :
>
> 226 + # Deleting field 'TeamEvent.venue'
> 227 + db.delete_column('events_teamevent', 'venue_id')
>
> we need to store in memory all venues/events relatiosn before then create them
> once the new table TeamEventVenue is created.

I added it, please check it.

Unmerged revisions

556. By Robert Sajdok on 2013-06-29: South Changes for team event venue.
555. By Robert Sajdok on 2013-02-07: Resolve conflicts
554. By Robert Sajdok on 2013-01-09: LP: #552762: "LD needs to be able to allow for adding multiple locations for one event"
Add image files and migration.
553. By Robert Sajdok on 2013-01-09: LP: #552762: "LD needs to be able to allow for adding multiple locations for one event"