svn commit: r1684204 - in /comdev/tools/events_list: models.py templates/events/index.html

[rg...@apache.org]

Author: rgardler
Date: Mon Jun  8 15:18:13 2015
New Revision: 1684204

URL: http://svn.apache.org/r1684204
Log:
add city and country to list

Modified:
    comdev/tools/events_list/models.py
    comdev/tools/events_list/templates/events/index.html

Modified: comdev/tools/events_list/models.py
URL: http://svn.apache.org/viewvc/comdev/tools/events_list/models.py?rev=1684204&r1=1684203&r2=1684204&view=diff
==============================================================================
--- comdev/tools/events_list/models.py (original)
+++ comdev/tools/events_list/models.py Mon Jun  8 15:18:13 2015
@@ -13,6 +13,8 @@ class Group(models.Model):
     def __unicode__(self):
         return u'{n}, {c}, {s}, {co}'.format(n=self.name, c=self.city, s=self.state, co=self.country)
 
+class Hashtag(models.Model):
+    hashtag = models.CharField(max_length=15)
     
 class Event(models.Model):
     name = models.CharField(max_length=200)
@@ -23,6 +25,7 @@ class Event(models.Model):
     local_start = models.DateTimeField()
     local_end = models.DateTimeField()
     utc_offset = models.BigIntegerField()
+    hashtag = models.ForeignKey(Hashtag)
     is_applicable = models.BooleanField(help_text = "Indicates if an event is applicable to our audience or not.", default=True)
     
     @property

Modified: comdev/tools/events_list/templates/events/index.html
URL: http://svn.apache.org/viewvc/comdev/tools/events_list/templates/events/index.html?rev=1684204&r1=1684203&r2=1684204&view=diff
==============================================================================
--- comdev/tools/events_list/templates/events/index.html (original)
+++ comdev/tools/events_list/templates/events/index.html Mon Jun  8 15:18:13 2015
@@ -12,7 +12,7 @@
   {% for event in upcoming_events_list %}
   <tr>
     <td><a href="{{ event.event_url }}">{{ event.name }}</a></td>
-    <td>{{ event.group.city }}, {{ event.group.state }}</td>
+    <td>{{ event.group.city }}, {{ event.group.state }}</a></td>
     <td>{{ event.group.country }}</td>
     <td>{{ event.local_start }}</td>
     <td><a href="{% url 'toggleNA' event.id %}">Mark N/A</a></td>