From 6ded7560091827a641ff2b78c4f39176131ff103 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 17 Sep 2013 21:40:21 +0200 Subject: [PATCH] provile_views: hide delegation section for guest delegates, fixes #3634 --- docbow_project/docbow/profile_views.py | 6 + .../docbow/templates/docbow/full-profile.html | 118 +++++++++--------- 2 files changed, 66 insertions(+), 58 deletions(-) diff --git a/docbow_project/docbow/profile_views.py b/docbow_project/docbow/profile_views.py index 6878e8b..f23f570 100644 --- a/docbow_project/docbow/profile_views.py +++ b/docbow_project/docbow/profile_views.py @@ -234,6 +234,12 @@ class FullProfileView(TemplateResponseMixin, View): ('password_change_form', PasswordChangeView), ) + def dispatch(self, request, *args, **kwargs): + if models.is_guest(request.user): + self.subviews = filter(lambda s: s[0] != 'delegate_form', self.subviews) + print self.subviews + return super(FullProfileView, self).dispatch(request, *args, **kwargs) + def post(self, request, *args, **kwargs): ctx = {} for var_name, view_class in self.subviews: diff --git a/docbow_project/docbow/templates/docbow/full-profile.html b/docbow_project/docbow/templates/docbow/full-profile.html index 9902a8d..4ca97e4 100644 --- a/docbow_project/docbow/templates/docbow/full-profile.html +++ b/docbow_project/docbow/templates/docbow/full-profile.html @@ -18,68 +18,70 @@ {% crispy profile_form profile_form.helper %} -

{% trans "Delegations" %}

+{% if delegate_form %} +

{% trans "Delegations" %}

-

Délégations attribuées

+

Délégations attribuées

-{% if delegations %} -
-{% csrf_token %} - - - - - - - - - - - -{% for delegation in delegations %} - - - - - - - - - {% if delegation.journals %} - - {% else %} - {% if delegation.to.date_joined != delegation.to.last_login %} - - {% else %} - - {% endif %} - {% endif %} - -{% endfor %} - -
PrénomNomCourrielIdentifiant
{{ delegation.to.first_name }}{{ delegation.to.last_name }}{{ delegation.to.email }}{{ delegation.to.username }}
Dernière(s) connexion(s): {% for connection_time in delegation.journals %} - {{ connection_time }} - {% if not forloop.last %}, {% endif %} - {% endfor %}Dernière connexion: {{ delegation.to.last_login }}Aucune connexion.
-
-{% else %} -

Aucune délégation attribuée

-{% endif %} + {% if delegations %} +
+ {% csrf_token %} + + + + + + + + + + + + {% for delegation in delegations %} + + + + + + + + + {% if delegation.journals %} + + {% else %} + {% if delegation.to.date_joined != delegation.to.last_login %} + + {% else %} + + {% endif %} + {% endif %} + + {% endfor %} + +
PrénomNomCourrielIdentifiant
{{ delegation.to.first_name }}{{ delegation.to.last_name }}{{ delegation.to.email }}{{ delegation.to.username }}
Dernière(s) connexion(s): {% for connection_time in delegation.journals %} + {{ connection_time }} + {% if not forloop.last %}, {% endif %} + {% endfor %}Dernière connexion: {{ delegation.to.last_login }}Aucune connexion.
+
+ {% else %} +

Aucune délégation attribuée

+ {% endif %} -

{% trans "Create a new delegation" %}

-
-{% crispy delegate_form delegate_form.helper %} -
+

{% trans "Create a new delegation" %}

+
+ {% crispy delegate_form delegate_form.helper %} +
-

{% trans "Received delegations" %}

-{% if received_delegations %} - -{% else %} -

Aucune délégation reçue

+

{% trans "Received delegations" %}

+ {% if received_delegations %} + + {% else %} +

Aucune délégation reçue

+ {% endif %} {% endif %}

{% trans "Changing password" %}