From: yomguy Date: Thu, 19 Apr 2012 09:21:02 +0000 (+0200) Subject: fix conference infos X-Git-Tag: 0.2~4 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b60ad9cf1f52ed0e8110457aa511419912ed4962;p=teleforma.git fix conference infos --- diff --git a/teleforma/models.py b/teleforma/models.py index 9517d419..a3722cb8 100755 --- a/teleforma/models.py +++ b/teleforma/models.py @@ -148,7 +148,7 @@ class Professor(Model): verbose_name=_('training'), blank=True, null=True) def __unicode__(self): - return self.user.username + return self.user.first_name + ' ' + self.user.last_name class Meta: db_table = app_label + '_' + 'professor' diff --git a/teleforma/templates/teleforma/course_conference.html b/teleforma/templates/teleforma/course_conference.html index 558f265c..e77cf6bb 100644 --- a/teleforma/templates/teleforma/course_conference.html +++ b/teleforma/templates/teleforma/course_conference.html @@ -30,6 +30,12 @@ {% block general_info %}
+
{% trans "Title" %}
{{ conference.course.title }}
+
{% trans "Session" %}
{{ conference.session }}
+
{% trans "Professor" %}
{{ conference.professor }}
+
{% trans "Begin" %}
{{ conference.date_begin }}
+
{% trans "End" %}
{{ conference.date_end }}
+
{% trans "Live" %}
{{ conference.streaming }}
{% endblock general_info %}