Michael Hall has proposed merging lp:~mhall119/loco-directory/fixes-610495 into
lp:loco-directory.
Requested reviews:
loco-directory-dev (loco-directory-dev)
Related bugs:
#610495 For global events, the new event date picker should be constrained
within the date region
https://bugs.launchpad.net/bugs/610495
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.
--
https://code.launchpad.net/~mhall119/loco-directory/fixes-610495/+merge/31229
Your team loco-directory-dev is requested to review the proposed merge of
lp:~mhall119/loco-directory/fixes-610495 into lp:loco-directory.
=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py 2010-06-19 21:35:39 +0000
+++ loco_directory/events/views.py 2010-07-29 02:12:44 +0000
@@ -194,6 +194,7 @@
is_member = launchpad.is_team_member(request.user, team_object)
if is_on_lc or is_member:
+ global_event = None
if request.method == 'POST':
form = TeamEventForm(data=request.POST)
if form.is_valid():
@@ -203,10 +204,13 @@
return redirect( team_object )
else:
form = TeamEventForm(initial={'global_event':request.GET.get('global_event_id', None)})
-
+ if request.GET.has_key('global_event_id'):
+ global_event = get_object_or_404(GlobalEvent, pk=request.GET.get('global_event_id'))
+
context = {
'team_object': team_object,
'form': form,
+ 'global_event': global_event,
}
return render_to_response('events/team_event_new.html',
context, RequestContext(request))
=== modified file 'loco_directory/templates/events/team_event_new.html'
--- loco_directory/templates/events/team_event_new.html 2010-06-24 19:18:57 +0000
+++ loco_directory/templates/events/team_event_new.html 2010-07-29 02:12:44 +0000
@@ -5,6 +5,14 @@
{% block extrahead %}{{ block.super }}
{{form.media}}
+{% if global_event %}
+<script>
+ $.datepicker.setDefaults({
+ minDate: new Date({{global_event.date_begin.year}}, {{global_event.date_begin.month}}, {{global_event.date_begin.day}} ),
+ maxDate: new Date({{global_event.date_end.year}}, {{global_event.date_end.month}}, {{global_event.date_end.day}} )
+ });
+</script>
+{% endif %}
{% endblock %}
{% block sub_nav %}
_______________________________________________
Mailing list: https://launchpad.net/~loco-directory-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~loco-directory-dev
More help : https://help.launchpad.net/ListHelp
