Merge branch 'develop'

Author: marcosgabarda

pycones/schedules/helpers.py

@@ -164,8 +164,9 @@ def export_to_xcal(days_queryset):
                 text_element.text = slot.content.get_title()
                 description = slot.content.get_description()
                 description_element = ElementTree.SubElement(properties_element, "description")
-                text_element = ElementTree.SubElement(description_element, "text")
-                text_element.text = (description.raw if hasattr(description, "raw") else description).replace("\r\n", "")
+                if description:
+                    text_element = ElementTree.SubElement(description_element, "text")
+                    text_element.text = (description.raw if hasattr(description, "raw") else description).replace("\r\n", "")
                 location_element = ElementTree.SubElement(properties_element, "location")
                 location_element.text = slot.room.name
                 dtstart_element = ElementTree.SubElement(properties_element, "dtstart")
@@ -221,9 +222,10 @@ def export_to_icalendar(days_queryset):
                     event.add('location', slot.room.name)
                 event.add('summary', slot.content.get_title())
                 description = slot.content.get_description()
-                event.add('description', (description.raw
-                                          if hasattr(description, "raw")
-                                          else description).replace("\r\n", ""))
+                if description:
+                    event.add('description', (description.raw
+                                              if hasattr(description, "raw")
+                                              else description).replace("\r\n", ""))
                 cal.add_component(event)
     return cal.to_ical()
 

pycones/schedules/models.py

@@ -170,7 +170,7 @@ def get_keynote_url(self):
         elif self.keynote_url:
             return self.keynote_url
         try:
-            return self.presentatione.get_keynote_url()
+            return self.presentation.get_keynote_url()
         except ObjectDoesNotExist:
             pass
         return ""

pycones/templates/schedule/details.html

@@ -20,7 +20,7 @@ <h2>
                 </h2>
                 {% endfor %}
                 <ul class="list-unstyled">
-                    <li>{{ slot.day.date }}, {{ slot.start }} - {{ slot.end }}</li>
+                    <li>{{ slot.day.date|date:"d F Y" }}, {{ slot.start }} - {{ slot.end }}</li>
                     {% if slot.room %}
                     <li>{{ slot.room }}</li>
                     {% endif %}

pycones/templates/schedule/show.html

@@ -9,7 +9,7 @@
         {% for day in days %}
             <div class="row">
                 <div class="col-12 day">
-                    <h2>{{ day.date }}</h2>
+                    <h2>{{ day.date|date:"d F Y" }}</h2>
                 </div>
             </div>
             <div class="row track-title-row hidden-xs">