From: yomguy Date: Thu, 12 Apr 2012 08:54:47 +0000 (+0200) Subject: add messages to training users X-Git-Tag: 0.2~63 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b85a481677a0307cc51324961b33954f787cb2ba;p=teleforma.git add messages to training users --- diff --git a/teleforma/templates/telemeta/users.html b/teleforma/templates/telemeta/users.html index a5382100..cbea2e08 100644 --- a/teleforma/templates/telemeta/users.html +++ b/teleforma/templates/telemeta/users.html @@ -1,6 +1,7 @@ {% extends "telemeta/base.html" %} {% load i18n %} {% load telemeta_utils %} +{% load teleforma_tags %} {% block head_title %}{% trans "Users" %} - {{ block.super }}{% endblock %} @@ -22,6 +23,13 @@ + +{% if users %} +
+{% trans "New message" %} +
+{% endif %} +
diff --git a/teleforma/templatetags/teleforma_tags.py b/teleforma/templatetags/teleforma_tags.py index 322d8c7c..56e31aa4 100644 --- a/teleforma/templatetags/teleforma_tags.py +++ b/teleforma/templatetags/teleforma_tags.py @@ -49,3 +49,10 @@ class ValueFromSettings(template.Node): def trainings(user): student = user.student.get() return training.student.all() + +@register.filter +def to_recipients(users): + list = [] + for user in users: + list.append(user.username) + return ':'.join(list) diff --git a/teleforma/views.py b/teleforma/views.py index cc7c00fa..c2efa52d 100755 --- a/teleforma/views.py +++ b/teleforma/views.py @@ -131,18 +131,20 @@ class UsersView(ListView): def get_context_data(self, **kwargs): context = super(UsersView, self).get_context_data(**kwargs) context['trainings'] = Training.objects.all() + context['all_users'] = User.objects.all() return context class UsersTrainingView(UsersView): def get_queryset(self): users = User.objects.all().select_related(depth=2) - trainings = Training.objects.filter(id=self.args[0]) - return User.objects.filter(student__training__in=trainings) + self.trainings = Training.objects.filter(id=self.args[0]) + return User.objects.filter(student__training__in=self.trainings) def get_context_data(self, **kwargs): context = super(UsersTrainingView, self).get_context_data(**kwargs) context['training'] = Training.objects.get(id=self.args[0]) + context['all_users'] = User.objects.filter(student__training__in=self.trainings).all() return context class UsersXLSExport(object):