Merge pull request #37 from georgebrock/fix-past-substandards-locations

Fix some event metadata

ps_data.py

@@ -70,12 +70,14 @@ def __init__(self, data={}, date=None, manual=False):
                 v = datetime.datetime.strptime(v, "%H:%M").time()
             setattr(self, k, v)
 
-        for venue in VENUES:
-            if venue.from_date < self.date.date() and (venue.until_date is None or venue.until_date > self.date.date()):
-                self.location = venue.name
-                self.address = venue.address
-                self.description = venue.description
-                break
+        if self.location is None:
+            for venue in VENUES:
+                if venue.from_date < self.date.date() and (venue.until_date is None or venue.until_date > self.date.date()):
+                    self.location = venue.name
+                    self.address = venue.address
+                    if self.description is None:
+                        self.description = venue.description
+                    break
         if self.location is None:
             # For some reason couldn't find it, use last venue in the list in the hope
             # that "current" is more helpful than blank or exploding.

templates/event.html

@@ -5,7 +5,7 @@
 <meta name="twitter:card" content="summary" />
 <meta name="twitter:site" content="@pubstandards" />
 <meta property="og:title" content="{{event.name}}" />
-<meta property="og:description" content="{{event.description|truncate(190)}}" />
+{% if event.description %}<meta property="og:description" content="{{event.description|truncate(190)}}" />{% endif %}
 <meta property="og:image" content="https://london.pubstandards.com/static/beer_mat.jpg" />
 <meta property="og:url" content="https://london.pubstandards.com{{url_for('other_event', slug=event.slug)}}" />
 {% endblock %}