From 135a79a97b91c058142ab2a9359eb67999538a3a 2015-08-03 12:44:57
From: Patrick Altman <paltman@gmail.com>
Date: 2015-08-03 12:44:57
Subject: [PATCH] Merge pull request #110 from miurahr/slot_name_with_rooms

slot name includes rooms
---

diff --git a/symposion/schedule/models.py b/symposion/schedule/models.py
index 5b2a9413e1d1b178f23454604efd445a05161ff8..a0f88e8139c7eb420b2f32f6731c654b9ad0c8a3 100644
--- a/symposion/schedule/models.py
+++ b/symposion/schedule/models.py
@@ -125,7 +125,8 @@ class Slot(models.Model):
         return Room.objects.filter(pk__in=self.slotroom_set.values("room"))
 
     def __unicode__(self):
-        return u"%s %s (%s - %s)" % (self.day, self.kind, self.start, self.end)
+        roomlist = ' '.join(map(lambda r: r.__unicode__(), self.rooms))
+        return u"%s %s (%s - %s) %s" % (self.day, self.kind, self.start, self.end, roomlist)
 
     class Meta:
         ordering = ["day", "start", "end"]