Merge lp:~summit-hackers/summit/rm-rf into lp:summit

[Chris Johnston]

Adds ability for summit.schedulers and is_staff to delete meetings from the front end

[lp:~summit-hackers/summit/rm-rf]

452. By Michael Hall on 2012-10-09

work from chris

453. By Michael Hall on 2012-10-09

Fixes to delete meeting tests

454. By Chris Johnston on 2012-10-09

Fixes one broken view

455. By Chris Johnston on 2012-10-09

Adds missing test

456. By Michael Hall on 2012-10-09

Remove debug prints, mark a meeting as REMOVED instead of actually deleting the record

457. By Michael Hall on 2012-10-09

Allow admin to filter by approved state, don't mark removed meetings as approved when importing again from launchpad

[Michael Hall (mhall119)]

Working well, tests pass

review: Approve

=== modified file 'summit/common/templatetags/menubuilder.py'
--- summit/common/templatetags/menubuilder.py	2012-10-03 21:01:17 +0000
+++ summit/common/templatetags/menubuilder.py	2012-10-09 19:03:21 +0000
@@ -19,6 +19,8 @@
         self.menu_name = menu_name
 
     def render(self, context):
+        if 'request' not in context:
+            return ''
         real_menu_name = context.get(self.menu_name, self.menu_name)
         current_path = context['request'].path
         user = context['request'].user

=== modified file 'summit/schedule/admin/meetingadmin.py'
--- summit/schedule/admin/meetingadmin.py	2012-10-02 02:23:02 +0000
+++ summit/schedule/admin/meetingadmin.py	2012-10-09 19:03:21 +0000
@@ -134,7 +134,7 @@
 class MeetingAdmin(admin.ModelAdmin):
     list_display = ('summit', 'name', 'title', 'slots', 'override_break', 'private', 'requires_dial_in', 'video', 'type', 'approved')
     list_display_links = ('name', 'title')
-    list_filter = ('summit', 'type', 'tracks', 'slots', 'private',
+    list_filter = ('summit', 'type', 'approved', 'tracks', 'slots', 'private',
                    'status', 'priority')
     search_fields = ('name', 'title')
 

=== modified file 'summit/schedule/models/meetingmodel.py'
--- summit/schedule/models/meetingmodel.py	2012-10-02 02:23:02 +0000
+++ summit/schedule/models/meetingmodel.py	2012-10-09 19:03:21 +0000
@@ -296,7 +296,8 @@
     def update_from_launchpad(self, elem):
         """Update from Launchpad data."""
 
-        self.approved = 'APPROVED'
+        if not self.approved == 'REMOVED':
+            self.approved = 'APPROVED'
         
         name = elem.get("name")
         if name:

=== modified file 'summit/schedule/templates/schedule/admin.html'
--- summit/schedule/templates/schedule/admin.html	2012-06-10 20:34:50 +0000
+++ summit/schedule/templates/schedule/admin.html	2012-10-09 19:03:21 +0000
@@ -4,5 +4,8 @@
         <li><strong>Created by:</strong> {{ meeting.drafter.name }}</li>
         <li><strong>Approved by:</strong> {{ meeting.approver.name }}</li>
         <li><strong>Scheduled:</strong> {% for ai in agenda_items %}{% if ai.auto %}Auto{% else %}Manual{% endif %}{% endfor %}</li>
+        {% if is_scheduler %}
+        <li><strong><a href="{% url summit.schedule.views.delete_meeting_confirm summit.name, meeting.id, meeting.name|default:'-' %}">Delete Meeting</a></strong></li>
+        {% endif %}
     </ul>
 </div>

=== added file 'summit/schedule/templates/schedule/confirm_deletion.html'
--- summit/schedule/templates/schedule/confirm_deletion.html	1970-01-01 00:00:00 +0000
+++ summit/schedule/templates/schedule/confirm_deletion.html	2012-10-09 19:03:21 +0000
@@ -0,0 +1,16 @@
+{% extends "base.html" %}
+
+{% block page_name %}Meeting Successfully Deleted - {{ summit.title }}{%endblock %}
+{% block sub_nav %}{% endblock %}
+
+{% block extrahead %}{{ block.super }}
+{% endblock %}
+
+{% block content %}
+<div class="row">
+    <article id="form" class="span-8">
+        <h3>Meeting Deleted</h3>
+            <p>You have successfully deleted the meeting</p>
+    </article>
+</div>
+{% endblock %}

=== added file 'summit/schedule/templates/schedule/delete_confirm.html'
--- summit/schedule/templates/schedule/delete_confirm.html	1970-01-01 00:00:00 +0000
+++ summit/schedule/templates/schedule/delete_confirm.html	2012-10-09 19:03:21 +0000
@@ -0,0 +1,20 @@
+{% extends "base.html" %}
+
+{% block page_name %}Delete {{ meeting.title }} - {{ summit.title }}{%endblock %}
+{% block sub_nav %}{% endblock %}
+
+{% block extrahead %}{{ block.super }}
+{% endblock %}
+
+{% block content %}
+<div class="row">
+    <article id="form" class="span-8">
+        <h3>Delete {{ meeting.title }}</h3>
+            <p>You are about to delete "{{ meeting.title }}". Are you absolutely sure that you wish to do this?</p>
+            {% if meeting.spec_url %}
+                <p>NOTE: This meeting was created by a <a href="{{ meeting.spec_url }}">blueprint</a>. The blueprint needs to be marked declined prior to deleting this meeting, or the meeting will reappear.</p>
+            {% endif %}
+            <p><a href="{% url summit.schedule.views.delete_meeting summit.name, meeting.id, meeting.name|default:'-' %}" class="submit-button">Delete Meeting</a></p>
+    </article>
+</div>
+{% endblock %}

=== modified file 'summit/schedule/tests.py'
--- summit/schedule/tests.py	2012-10-02 02:23:02 +0000
+++ summit/schedule/tests.py	2012-10-09 19:03:21 +0000
@@ -24,7 +24,7 @@
 from django.core.handlers.wsgi import WSGIRequest
 from django.core.urlresolvers import reverse
 from django.conf import settings
-from django.contrib.auth.models import User
+from django.contrib.auth.models import User, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.core.cache import cache
@@ -42,7 +42,8 @@
                                     Room,
                                     Agenda,
                                     Participant,
-                                    SummitSprint)
+                                    SummitSprint,
+                                    Lead)
                                     
 from summit.schedule.render import Schedule
 from summit.common import launchpad
@@ -1894,3 +1895,75 @@
 
         self.assertEqual(1, summit.attendee_set.filter(user__username__exact="testuser").count())
         self.assertTrue(mock_set_openid.called)
+
+class DeleteMeetingTestCase(djangotest.TestCase):
+    """
+    This will test different options for deleting a meeting from
+    the front end UI.
+    """
+ 
+    def setUp(self):
+        now = datetime.datetime.utcnow()
+        one_hour = datetime.timedelta(0, 3600)
+        self.summit = factory.make_one(Summit, name='uds-test', date_start=now, date_end=now+one_hour)
+        self.summit.save()
+        slot = factory.make_one(
+            Slot,
+            summit=self.summit,
+            start_utc=now,
+            end_utc=now+one_hour)
+        room = factory.make_one(Room)
+ 
+        self.meeting = factory.make_one(Meeting, summit=self.summit, requires_dial_in=False, private=False)
+ 
+        attendee1 = factory.make_one(Attendee)
+        factory.make_one(Participant, meeting=self.meeting, attendee=attendee1)
+ 
+        factory.make_one(Agenda, meeting=self.meeting, slot=slot, room=room)
+        
+        self.user = factory.make_one(User, username='testuser', is_active=True, is_superuser=False)
+        self.user.set_password('password')
+        self.user.save()
+ 
+        self.attendee = factory.make_one(Attendee, user=self.user, summit=self.summit)
+ 
+    def tearDown(self):
+        self.client.logout()
+        self.user.user_permissions.all().delete()
+
+    def login(self):
+        logged_in = self.client.login(username='testuser', password='password')
+        self.assertTrue(logged_in)
+ 
+    def test_track_lead_cant_delete_meeting(self):
+        self.lead = factory.make_one(Lead, lead=self.attendee, summit=self.summit)
+        self.login()
+        response = self.client.get(reverse('summit.schedule.views.delete_meeting', args=(self.summit, self.meeting.id, self.meeting.name)))
+        self.assertRedirects(response, reverse('summit.schedule.views.summit', args=(self.summit.name,)), status_code=302, target_status_code=200)
+
+    def test_user_cant_delete_meeting(self):
+        self.login()
+        response = self.client.get(reverse('summit.schedule.views.delete_meeting', args=(self.summit, self.meeting.id, self.meeting.name)))
+        self.assertRedirects(response, reverse('summit.schedule.views.summit', args=(self.summit.name,)), status_code=302, target_status_code=200)
+
+    def test_managers_cant_delete_meeting(self):
+        self.summit.managers.add(self.user)
+        self.login()
+        response = self.client.get(reverse('summit.schedule.views.delete_meeting', args=(self.summit, self.meeting.id, self.meeting.name)))
+        self.assertRedirects(response, reverse('summit.schedule.views.summit', args=(self.summit.name,)), status_code=302, target_status_code=200)
+
+    def test_schedulers_can_delete_meeting(self):
+        self.summit.schedulers.add(self.user)
+        self.login()
+        response = self.client.get(reverse('summit.schedule.views.delete_meeting', args=(self.summit, self.meeting.id, self.meeting.name)))
+        self.assertRedirects(response, reverse('summit.schedule.views.delete_confirmed', args=(self.summit.name,)), status_code=302, target_status_code=200)
+
+    def test_change_agenda_can_delete_meeting(self):
+        """
+        Testing if a user who is assigned can_change_agenda in django admin can delete a meeting
+        """
+        change_agenda = Permission.objects.get(codename='change_agenda')
+        self.user.user_permissions.add(change_agenda)
+        self.login()
+        response = self.client.get(reverse('summit.schedule.views.delete_meeting', args=(self.summit, self.meeting.id, self.meeting.name)))
+        self.assertRedirects(response, reverse('summit.schedule.views.delete_confirmed', args=(self.summit.name,)), status_code=302, target_status_code=200)

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2012-09-14 14:57:02 +0000
+++ summit/schedule/views.py	2012-10-09 19:03:21 +0000
@@ -366,6 +366,7 @@
         'ETHERPAD_HOST': summit.etherpad,
         'summit_organizer': summit.is_organizer(attendee),
         'scheduler': summit.can_change_agenda(attendee),
+        'is_scheduler': summit.is_scheduler(attendee),
         'drafter': drafter,
     }
     return render_to_response("schedule/meeting.html", context,
@@ -750,3 +751,41 @@
     }
     return render_to_response('schedule/org_attend.html',
                           context, RequestContext(request))
+
+
+@summit_attendee_required
+def delete_meeting_confirm(request, summit, attendee, meeting_id, meeting_slug):
+    meeting = get_object_or_404(summit.meeting_set, id=meeting_id)
+    
+    if not attendee.user in summit.schedulers.all() and not attendee.user.has_perm('schedule.change_agenda'):
+        return HttpResponseRedirect(reverse('summit.schedule.views.summit', args=(summit.name,)))
+
+    context = {
+        'summit': summit,
+        'meeting.title': meeting.title,
+        'meeting': meeting,
+    }
+    return render_to_response('schedule/delete_confirm.html',
+                          context, RequestContext(request))
+
+
+@summit_attendee_required
+def delete_meeting(request, summit, attendee, meeting_id, meeting_slug):
+    meeting = get_object_or_404(summit.meeting_set, pk = meeting_id)
+    if not attendee.user in summit.schedulers.all() and not attendee.user.has_perm('schedule.change_agenda'):
+        return HttpResponseRedirect(reverse('summit.schedule.views.summit', args=(summit.name,)))
+    else:
+        meeting.approved = 'REMOVED'
+        meeting.save()
+        meeting.agenda_set.all().delete()
+        return HttpResponseRedirect(reverse('summit.schedule.views.delete_confirmed', args=(summit.name,)))
+
+def delete_confirmed(request, summit_name):
+    summit = get_object_or_404(Summit, name=summit_name)
+    
+    context = {
+        'summit': summit
+    }
+
+    return render_to_response('schedule/confirm_deletion.html',
+                          context, RequestContext(request))

=== modified file 'summit/urls.py'
--- summit/urls.py	2012-08-05 16:31:15 +0000
+++ summit/urls.py	2012-10-09 19:03:21 +0000
@@ -75,6 +75,9 @@
     (r'^(?P<summit_name>[\w-]+)/edit_attendee/(?P<meeting_id>\d+)/(?P<username>[%+\.\w-]+)/$', 'organizer_edit_attendees'),
     (r'^(?P<summit_name>[\w-]+)/create_meeting/$', 'create_meeting'),
     (r'^(?P<summit_name>[\w-]+)/edit_mtg/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$', 'organizer_edit_meeting'),
+    (r'^(?P<summit_name>[\w-]+)/confirm_del_mtg/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$', 'delete_meeting_confirm'),
+    (r'^(?P<summit_name>[\w-]+)/del_mtg/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$', 'delete_meeting'),
+    (r'^(?P<summit_name>[\w-]+)/deleted/$', 'delete_confirmed'),
     (r'^(?P<summit_name>[\w-]+)/attendee_review/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$', 'attendee_review'),
     (r'^(?P<summit_name>[\w-]+)/tracks$', 'tracks'),
     (r'^(?P<summit_name>[\w-]+)/next$', 'next_session'),