Исправлены конфликты

2015-06-14 16:53:51 +05:00
parent a66d089933 c9e24fd874
commit 4abe7bbd92
5 changed files with 91 additions and 19 deletions
--- a/asuzr/models.py
+++ b/asuzr/models.py
@@ -19,7 +19,7 @@ class Schedule(models.Model):
  designer = models.ForeignKey(User)
  
  def __unicode__(self):
-    return ', '.join((self.date.strftime('%d %b %Y'), self.designer.first_name,))
+    return ' '.join((self.designer.first_name, self.designer.last_name))

 #Таблица посещаемости
 class Attendance(models.Model):