From 6eeb61de5cf1f9710f4e26068a2d9fbe59663899 Mon Sep 17 00:00:00 2001 From: Thomas NOEL Date: Fri, 17 Jan 2014 11:57:15 +0100 Subject: [PATCH] pfidp/users_admin: list all users --- .../pfidp/templates/users_admin/index.html | 3 +- .../templates/users_admin/read-list.html | 71 +++++++++++++++++++ virtualenv/pfidp/users_admin/views.py | 6 +- 3 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 virtualenv/pfidp/templates/users_admin/read-list.html diff --git a/virtualenv/pfidp/templates/users_admin/index.html b/virtualenv/pfidp/templates/users_admin/index.html index 2771414..a6b7382 100644 --- a/virtualenv/pfidp/templates/users_admin/index.html +++ b/virtualenv/pfidp/templates/users_admin/index.html @@ -90,7 +90,8 @@ - + + diff --git a/virtualenv/pfidp/templates/users_admin/read-list.html b/virtualenv/pfidp/templates/users_admin/read-list.html new file mode 100644 index 0000000..0a9d304 --- /dev/null +++ b/virtualenv/pfidp/templates/users_admin/read-list.html @@ -0,0 +1,71 @@ +{% load staticfiles %} + + + + Utilisateurs UnivNautes + + + + + + + + + + + + + + + + + +
+
+
+ Utilisateurs IdP UnivNautes — {% now "j F Y H:i" %} +
+
+
+ +
+ + {% for user in users %} +
+

+ Login : {{ user.name }} + {% if user.descr %} — {{ user.descr }}{% endif %} +

+ {% if user.password %}

Mot de passe : {{ user.password }}

{% endif %} +

Expire le {{ user.expires }}

+
+ {% endfor %} + +
+ + + diff --git a/virtualenv/pfidp/users_admin/views.py b/virtualenv/pfidp/users_admin/views.py index da3dd80..a3879e0 100644 --- a/virtualenv/pfidp/users_admin/views.py +++ b/virtualenv/pfidp/users_admin/views.py @@ -220,6 +220,7 @@ ACTION_NAME = { 'delete': u'Suppression', 'desactivate': u'Désactivation', 'activate': u'Activation', + 'read': u'Afficher les utilisateurs', 'csv': u'Export CSV', } @@ -238,12 +239,15 @@ def multiple(request): if len(names) == 0: messages.warning(request, u'Sélectionnez au moins un utilisateur.') return redirect('.') - all_pfusers = pfusers.get_all_pfusers(with_password=(action=="csv")) + all_pfusers = pfusers.get_all_pfusers(with_password=(action in ['read','csv'])) try: users = [ all_pfusers[name] for name in names ] except KeyError: messages.error(request, u'Au moins un utilisateur inconnu dans la liste.') return redirect('.') + if action == "read": + return render_to_response('users_admin/read-list.html', + { 'users': users, }, context_instance=RequestContext(request)) if action == "csv": return csv(users) request.session['univnautes_idpua_action'] = action