From e0cb47d03af60192944d3dc49cc810d16e8b8de7 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Thu, 16 Jul 2015 17:11:25 -0500 Subject: [PATCH] Add list of assigned users to role view page. This surely could be better still; at least this is *something*. --- tailbone/templates/roles/read.mako | 37 ++++++++++++++++++++++++++++++ tailbone/views/roles.py | 8 ++++++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 tailbone/templates/roles/read.mako diff --git a/tailbone/templates/roles/read.mako b/tailbone/templates/roles/read.mako new file mode 100644 index 00000000..c4710de3 --- /dev/null +++ b/tailbone/templates/roles/read.mako @@ -0,0 +1,37 @@ +## -*- coding: utf-8 -*- +<%inherit file="/roles/crud.mako" /> + +${parent.body()} + +

Users

+ +% if role is guest_role: + +

The guest role is implied for all users.

+ +% elif role.users: + +

The following users are assigned to this role:

+
+
+ + + + + + + % for i, user in enumerate(role.users, 1): + + + + % endfor + +
UsernameFull Name
${user.username} + ${user.display_name}
+
+ +% else: + +

There are no users assigned to this role.

+ +% endif diff --git a/tailbone/views/roles.py b/tailbone/views/roles.py index 926a1658..9e70032c 100644 --- a/tailbone/views/roles.py +++ b/tailbone/views/roles.py @@ -260,6 +260,12 @@ class RoleCrud(CrudView): ]) return fs + def template_kwargs(self, form): + kwargs = super(RoleCrud, self).template_kwargs(form) + kwargs['role'] = form.fieldset.model + kwargs['guest_role'] = guest_role(Session) + return kwargs + def pre_delete(self, model): admin = administrator_role(Session()) guest = guest_role(Session()) @@ -295,7 +301,7 @@ def includeme(config): config.add_route('role.read', '/roles/{uuid}') config.add_view(RoleCrud, attr='read', route_name='role.read', - renderer='/roles/crud.mako', + renderer='/roles/read.mako', permission='roles.read') config.add_route('role.update', '/roles/{uuid}/edit')