Merge lp:~toabctl/loco-team-portal/better_ical_support into lp:loco-team-portal

[Thomas Bechtold]

[lp:~toabctl/loco-team-portal/better_ical_support]

40. By Thomas Bechtold on 2010-01-12

add confirmation page before team/global event delete

41. By Thomas Bechtold on 2010-01-12

remove useless <table>

[Daniel Holbach (dholbach)]

good work!

review: Approve

=== modified file 'loco_directory/events/forms.py'
--- loco_directory/events/forms.py	2010-01-11 12:41:30 +0000
+++ loco_directory/events/forms.py	2010-01-12 08:01:16 +0000
@@ -51,6 +51,10 @@
     """
     a form to create/update an Attendee object
     """
+    def __init__(self, *args, **kargs):
+        super(AttendeeRegistrationForm, self).__init__(*args, **kargs)
+        self.fields['guests'].min_value = 0
+
     class Meta:
         model = Attendee
         exclude = ('attendee', 'team_event')

=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2010-01-11 22:24:24 +0000
+++ loco_directory/events/views.py	2010-01-12 08:01:16 +0000
@@ -117,9 +117,14 @@
             break
 
     if is_on_lc or is_contact:
-        team_event_object.delete()
-        request.user.message_set.create(message=_('Team Event removed'))
-        return redirect( 'event-list' )
+        if request.method == 'POST':		
+            team_event_object.delete()
+            request.user.message_set.create(message=_('Team Event removed'))
+            return redirect( 'event-list' )
+        else:
+            context = {'team_event_object': team_event_object}
+            return render_to_response('events/team_event_delete_confirm.html', context, RequestContext(request))
+
     else:
         request.user.message_set.create(message=_('You can not remove this team event.'))
         return redirect( team_event_object )
@@ -135,7 +140,7 @@
     is_contact = launchpad.is_admin_or_owner(request.user.username, team_object)
     
     if is_on_lc or is_contact:
-        if request.method == 'POST':		
+        if request.method == 'POST':
             form = TeamEventForm(data=request.POST)
             if form.is_valid():
                 team_event = form.save()
@@ -188,6 +193,9 @@
         return redirect( team_event_object )
 
 def team_event_register(request, team_event_id):
+    """
+    register as attendee for a team event
+    """
     team_event_object = get_object_or_404(TeamEvent, pk=team_event_id)
     if team_event_object.is_attending(request.user):
         attendee_object = team_event_object.attendee_set.get(attendee=request.user)
@@ -201,7 +209,7 @@
             request.user.message_set.create(message=_('Your registration has been saved'))
             return redirect( team_event_object )
     else:
-        form = AttendeeRegistrationForm(instance=attendee_object)
+        form = AttendeeRegistrationForm(instance=attendee_object, initial={'guests':0})
     
     context = {
            'form': form
@@ -264,9 +272,13 @@
     is_on_lc = launchpad.is_user_on_loco_council(request.user)
     
     if is_on_lc:
-        global_event_object.delete()
-        request.user.message_set.create(message=_('Global Event removed'))
-        return redirect( 'event-list' )
+        if request.method == 'POST':		
+            global_event_object.delete()
+            request.user.message_set.create(message=_('Global Event removed'))
+            return redirect( 'event-list' )
+        else:
+            context = {'global_event_object': global_event_object}
+            return render_to_response('events/global_event_delete_confirm.html', context, RequestContext(request))
     else:
         request.user.message_set.create(message=_('You can not remove this global event.'))
         return redirect( global_event_object )

=== added file 'loco_directory/templates/events/global_event_delete_confirm.html'
--- loco_directory/templates/events/global_event_delete_confirm.html	1970-01-01 00:00:00 +0000
+++ loco_directory/templates/events/global_event_delete_confirm.html	2010-01-12 08:01:16 +0000
@@ -0,0 +1,17 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block title %}{% trans "Delete Global Event" %}{% endblock %}
+
+{% block extrahead %}{{ block.super }}
+{{form.media}}
+{% endblock %}
+
+{% block content %}
+<h1>{% trans "Delete global Event" %}</h1>
+{% blocktrans with global_event_object.name as eventname %}Do you realy want to delete the Global Event {{eventname}}?{% endblocktrans %}
+<form action="." method="post">
+		<p><input type="submit" value="Submit" /> <a href="{{global_event_object.get_absolute_url}}">{% trans "Cancel" %}</a></p>
+</form>
+
+{% endblock %}

=== added file 'loco_directory/templates/events/team_event_delete_confirm.html'
--- loco_directory/templates/events/team_event_delete_confirm.html	1970-01-01 00:00:00 +0000
+++ loco_directory/templates/events/team_event_delete_confirm.html	2010-01-12 08:01:16 +0000
@@ -0,0 +1,17 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block title %}{% trans "Delete Team Event" %}{% endblock %}
+
+{% block extrahead %}{{ block.super }}
+{{form.media}}
+{% endblock %}
+
+{% block content %}
+<h1>{% trans "Delete Team Event" %}</h1>
+{% blocktrans with team_event_object.name as eventname %}Do you realy want to delete the Team Event {{eventname}}?{% endblocktrans %}
+<form action="." method="post">
+		<p><input type="submit" value="Submit" /> <a href="{{team_event_object.get_absolute_url}}">{% trans "Cancel" %}</a></p>
+</form>
+
+{% endblock %}

=== modified file 'loco_directory/templates/teams/team_list.html'
--- loco_directory/templates/teams/team_list.html	2010-01-10 21:40:21 +0000
+++ loco_directory/templates/teams/team_list.html	2010-01-12 08:01:16 +0000
@@ -18,17 +18,11 @@
 		{{ form.as_line }}
 		<input type="image" src="/media/img/search.png" title="{% trans "Search" %}" />
 </form>
-<table width="100%">
-<tr>
-<td width="100%" valign="top" class="col2_container">
 <ul>
 {% for team in team_list %}
 <li title="{% if team.approved %}{% blocktrans with team.name as teamname %}{{ teamname }} approved{% endblocktrans %}{% else %}{% blocktrans with team.name as teamname %}{{ teamname }} not approved{% endblocktrans %}{% endif %}" class="{% if team.approved %}approved{% else %}unapproved{% endif %} {% cycle 'col_left' 'col_right' %}"><a href="{{ team.get_absolute_url }}">{{ team.name }}</a></li>
 {% endfor %}
 </ul>
-</td>
-</tr>
-</table>
 
 {% else %}
 <p>{% trans "There are currently no teams in the Ubuntu LoCo Directory. :(" %}</p>