Merge lp:~mhall119/loco-team-portal/fixes-610495 into lp:loco-team-portal

Proposed by Michael Hall
Status: Merged
Merged at revision: 202
Proposed branch: lp:~mhall119/loco-team-portal/fixes-610495
Merge into: lp:loco-team-portal
Diff against target: 45 lines (+13/-1)
2 files modified
loco_directory/events/views.py (+5/-1)
loco_directory/templates/events/team_event_new.html (+8/-0)
To merge this branch: bzr merge lp:~mhall119/loco-team-portal/fixes-610495
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+31229@code.launchpad.net

Description of the change

When adding a team event by clicking on the "Add your team's event" link on a Global Event, this will restrict the datebpicker to just the dates for the global event. From there after, the date range will be unrestricted.

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Nice job!

review: Approve
202. By Daniel Holbach

merged lp:~mhall119/loco-directory/fixes-610495

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/events/views.py'
2--- loco_directory/events/views.py 2010-06-19 21:35:39 +0000
3+++ loco_directory/events/views.py 2010-07-29 02:12:44 +0000
4@@ -194,6 +194,7 @@
5 is_member = launchpad.is_team_member(request.user, team_object)
6
7 if is_on_lc or is_member:
8+ global_event = None
9 if request.method == 'POST':
10 form = TeamEventForm(data=request.POST)
11 if form.is_valid():
12@@ -203,10 +204,13 @@
13 return redirect( team_object )
14 else:
15 form = TeamEventForm(initial={'global_event':request.GET.get('global_event_id', None)})
16-
17+ if request.GET.has_key('global_event_id'):
18+ global_event = get_object_or_404(GlobalEvent, pk=request.GET.get('global_event_id'))
19+
20 context = {
21 'team_object': team_object,
22 'form': form,
23+ 'global_event': global_event,
24 }
25 return render_to_response('events/team_event_new.html',
26 context, RequestContext(request))
27
28=== modified file 'loco_directory/templates/events/team_event_new.html'
29--- loco_directory/templates/events/team_event_new.html 2010-06-24 19:18:57 +0000
30+++ loco_directory/templates/events/team_event_new.html 2010-07-29 02:12:44 +0000
31@@ -5,6 +5,14 @@
32
33 {% block extrahead %}{{ block.super }}
34 {{form.media}}
35+{% if global_event %}
36+<script>
37+ $.datepicker.setDefaults({
38+ minDate: new Date({{global_event.date_begin.year}}, {{global_event.date_begin.month}}, {{global_event.date_begin.day}} ),
39+ maxDate: new Date({{global_event.date_end.year}}, {{global_event.date_end.month}}, {{global_event.date_end.day}} )
40+ });
41+</script>
42+{% endif %}
43 {% endblock %}
44
45 {% block sub_nav %}

Subscribers

People subscribed via source and target branches