edit speaker profile

Author: marcosgabarda

config/urls.py

@@ -24,6 +24,7 @@
     url(r'^proposals/', include('pycones.proposals.urls', namespace="proposals")),
     url(r'^reviewers/', include('pycones.reviewers.urls', namespace="reviewers")),
     url(r'^schedule/', include('pycones.schedules.urls', namespace="schedule")),
+    url(r'^speakers/', include('pycones.speakers.urls', namespace="speakers")),
     url(r'^jobboard/', include('pycones.jobboard.urls', namespace="jobboard")),
 )
 

pycones/proposals/actions.py

@@ -1,9 +1,3 @@
-import csv
-
-from django.http import HttpResponse
-from django.utils.encoding import smart_text
-
-
 def send_confirmation_action(description="Send confirmation email"):
     def send_confirmation(modeladmin, request, queryset):
         for item in queryset:

pycones/schedules/actions.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function, division, absolute_import
+
+import csv
+
+from django.http import HttpResponse
+
+
+def download_speakers(modeladmin, request, queryset):
+    """Downloads as a CSV file the list of approved speakers, with name and email."""
+    speakers = []
+    for presentation in queryset:
+        speakers += list(presentation.get_speakers())
+    speakers = set(speakers)
+    response = HttpResponse(content_type="text/csv")
+    response["Content-Disposition"] = "attachment; filename=speakers.csv"
+    writer = csv.writer(response)
+    for speaker in speakers:
+        writer.writerow([speaker.name, speaker.user.email])
+    return response
+
+download_speakers.short_description = "Download speakers"

pycones/schedules/admin.py

@@ -5,6 +5,7 @@
 from django.contrib.admin import ModelAdmin
 from django.utils.translation import ugettext_lazy as _
 
+from pycones.schedules.actions import download_speakers
 from pycones.schedules.models import Day, Room, SlotKind, Slot, Presentation, Track
 
 
@@ -24,9 +25,11 @@ class TrackAdmin(ModelAdmin):
     list_display = ("id", "day", "name")
 
 
+@admin.register(Presentation)
+class PresentationAdmin(ModelAdmin):
+    actions = [download_speakers, ]
+
+
 admin.site.register(Day)
 admin.site.register(Room)
 admin.site.register(SlotKind)
-admin.site.register(Presentation)
-
-

pycones/schedules/forms.py

@@ -9,4 +9,6 @@ class PresentationForm(forms.ModelForm):
     class Meta:
         model = Presentation
         fields = ["keynote", "keynote_url"]
-
+        widgets = {
+            "keynote_url": forms.TextInput(attrs={"class": "form-control"})
+        }

pycones/schedules/views.py

@@ -6,6 +6,7 @@
 from django.contrib import messages
 from django.core.urlresolvers import reverse
 from django.http import HttpResponse
+from django.http.response import Http404
 from django.shortcuts import render, get_object_or_404, redirect
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _
@@ -61,7 +62,9 @@ def get_login_url(self):
         return reverse("speakers:sign-in")
 
     def get(self, request, presentation_id):
-        presentation = get_object_or_404(Presentation, pk=presentation_id, speaker=request.user.speaker_profile)
+        presentation = get_object_or_404(Presentation, pk=presentation_id)
+        if request.user.speaker not in presentation.get_speakers():
+            raise Http404()
         form = PresentationForm(instance=presentation)
         data = {
             "presentation": presentation,
@@ -70,7 +73,9 @@ def get(self, request, presentation_id):
         return render(request, self.template_name, data)
 
     def post(self, request, presentation_id):
-        presentation = get_object_or_404(Presentation, pk=presentation_id, speaker=request.user.speaker_profile)
+        presentation = get_object_or_404(Presentation, pk=presentation_id)
+        if request.user.speaker not in presentation.get_speakers():
+            raise Http404()
         form = PresentationForm(request.POST, request.FILES, instance=presentation)
         data = {
             "presentation": presentation,
@@ -79,7 +84,7 @@ def post(self, request, presentation_id):
         if form.is_valid():
             form.save()
             messages.success(request, _("Datos actualizados correctamente"))
-            return redirect(reverse("speakers:edit"))
+            return redirect(reverse("schedule:edit-presentation", kwargs={"presentation_id": presentation_id}))
         return render(request, self.template_name, data)
 
 

pycones/speakers/actions.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals, print_function, division, absolute_import
+
+import csv
+
+from django.http import HttpResponse
+
+
+def download_approved_speakers(modeladmin, request, queryset):
+    """Downloads as a CSV file the list of approved speakers, with name and email."""
+    speakers = filter(lambda item: item.is_approved(), queryset)
+    response = HttpResponse(content_type="text/csv")
+    response["Content-Disposition"] = "attachment; filename=speakers.csv"
+    writer = csv.writer(response)
+    for speaker in speakers:
+        writer.writerow([speaker.name, speaker.user.email])
+    return response
+
+download_approved_speakers.short_description = "Download approved speakers"

pycones/speakers/admin.py

@@ -3,8 +3,13 @@
 
 from django.contrib import admin
 
+from pycones.speakers.actions import download_approved_speakers
 from pycones.speakers.models import Speaker
 
-admin.site.register(Speaker,
-                    list_display=["name", "email", "created"],
-                    search_fields=["name"])
+
+@admin.register(Speaker)
+class SpeakerAdmin(admin.ModelAdmin):
+    list_display = ["name", "email", "created"]
+    search_fields = ["name"]
+    actions = [download_approved_speakers]
+

pycones/speakers/forms.py

@@ -9,7 +9,7 @@ class SpeakerForm(forms.ModelForm):
 
     class Meta:
         model = Speaker
-        fields = ["name", "email", "biography", "photo"]
+        fields = ["name", "biography", "photo"]
         widgets = {
             "biography": AdminMarkupTextareaWidget(attrs={"class": "form-control"}),
             "name": forms.TextInput(attrs={"class": "form-control"}),

pycones/speakers/models.py

@@ -55,16 +55,6 @@ def email(self):
         else:
             return self.invite_email
 
-    @property
-    def all_presentations(self):
-        presentations = []
-        if self.presentations:
-            for p in self.presentations.all():
-                presentations.append(p)
-            for p in self.copresentations.all():
-                presentations.append(p)
-        return presentations
-
     def __str__(self):
         if self.user:
             return self.name
@@ -77,6 +67,10 @@ def has_biography(self):
     def get_api_id(self):
         return "S{:05d}".format(self.pk)
 
+    def is_approved(self):
+        """Checks if the speaker has a presentation."""
+        return self.proposals.filter(presentation__isnull=False).exists() or self.presentations.exists()
+
     def save(self, **kwargs):
         """Save user full name by default for speaker."""
         if not self.name: