# HG changeset patch # User Lennard de Rijk # Date 1237452775 0 # Node ID 7343876363cd9e513a4e6d542b3105afd911d988 # Parent ea886e0aedc40c2cb9d9fd491a637c0b95f9790f Added the users' public name to the process_request page. Patch by: Lennard de Rijk Reviewed by: to-be-reviewed diff -r ea886e0aedc4 -r 7343876363cd app/soc/templates/soc/request/process_request.html --- a/app/soc/templates/soc/request/process_request.html Thu Mar 19 08:38:01 2009 +0000 +++ b/app/soc/templates/soc/request/process_request.html Thu Mar 19 08:52:55 2009 +0000 @@ -22,8 +22,8 @@

{% ifequal request_status "new" %} - This is the request from {{ entity.link_id }} to become a - {{ entity.role_verbose }} for {{entity.scope.name }}.
+ This is the request from {{ user_in_request.name }}({{ entity.link_id }}) + to become a {{ entity.role_verbose }} for {{entity.scope.name }}.
Please select your response by using the buttons below.

@@ -40,7 +40,7 @@ {% else %}

- This is the invitation to {{ entity.link_id }} to become a + This is the invitation to {{ user_in_request.name }}({{ entity.link_id }}) to become a {{ entity.role_verbose }} for {{entity.scope.name }}.
If you would like to withdraw this invite please press the withdraw button below. diff -r ea886e0aedc4 -r 7343876363cd app/soc/views/models/role.py --- a/app/soc/views/models/role.py Thu Mar 19 08:38:01 2009 +0000 +++ b/app/soc/views/models/role.py Thu Mar 19 08:52:55 2009 +0000 @@ -604,6 +604,8 @@ 'role': params['module_name']} request_entity = request_logic.logic.getForFields(fields, unique=True) + user_entity = user_logic.logic.getFromKeyNameOr404(request_entity.link_id) + get_dict = request.GET if 'status' in get_dict.keys(): @@ -630,6 +632,7 @@ # put the entity in the context context['entity'] = request_entity + context['user_in_request'] = user_entity context['request_status'] = request_entity.status context['module_name'] = params['module_name']