From 666c74904d6faf2c5c586f92d5e6ee105a211660 Mon Sep 17 00:00:00 2001 From: Sofia Papagiannaki Date: Mon, 3 Dec 2012 18:28:04 +0200 Subject: [PATCH] Change menu ``Report`` to ``Usage`` --- snf-astakos-app/astakos/im/api/__init__.py | 31 +++++++++++--------- snf-astakos-app/astakos/im/api/callpoint.py | 2 +- snf-astakos-app/astakos/im/api/spec.py | 2 +- .../im/{resource_list.html => resource_usage.html} | 0 snf-astakos-app/astakos/im/urls.py | 2 +- snf-astakos-app/astakos/im/views.py | 9 ++---- 6 files changed, 23 insertions(+), 23 deletions(-) rename snf-astakos-app/astakos/im/templates/im/{resource_list.html => resource_usage.html} (100%) diff --git a/snf-astakos-app/astakos/im/api/__init__.py b/snf-astakos-app/astakos/im/api/__init__.py index 663a8e6..754f34f 100644 --- a/snf-astakos-app/astakos/im/api/__init__.py +++ b/snf-astakos-app/astakos/im/api/__init__.py @@ -185,21 +185,24 @@ def get_menu(request, with_extra_links=False, with_signout=True): append(item( url=absolute(request, reverse('group_list')), name="Projects", - submenu=(item( - url=absolute(request, - reverse('group_list')), - name="Overview"), - item( - url=absolute(request, - reverse('group_create_list')), - name="Create"), - item( - url=absolute(request, - reverse('group_search')), - name="Join"),))) +# submenu=(item( +# url=absolute(request, +# reverse('group_list')), +# name="Overview"), +# item( +# url=absolute(request, +# reverse('group_create_list')), +# name="Create"), +# item( +# url=absolute(request, +# reverse('group_search')), +# name="Join"), +# ) + ) + ) append(item( - url=absolute(request, reverse('resource_list')), - name="Report")) + url=absolute(request, reverse('resource_usage')), + name="Usage")) append(item( url=absolute(request, reverse('feedback')), name="Feedback")) diff --git a/snf-astakos-app/astakos/im/api/callpoint.py b/snf-astakos-app/astakos/im/api/callpoint.py index 4194a2d..274609e 100644 --- a/snf-astakos-app/astakos/im/api/callpoint.py +++ b/snf-astakos-app/astakos/im/api/callpoint.py @@ -110,7 +110,7 @@ class AstakosCallpoint(): b = get_backend() return b.list_users(filter) - def get_user_status(self, user_id): + def get_user_usage(self, user_id): b = get_backend() return b.get_resource_usage(user_id) diff --git a/snf-astakos-app/astakos/im/api/spec.py b/snf-astakos-app/astakos/im/api/spec.py index 1ade92d..e4cbf77 100644 --- a/snf-astakos-app/astakos/im/api/spec.py +++ b/snf-astakos-app/astakos/im/api/spec.py @@ -200,7 +200,7 @@ class AstakosAPI(Specificator): ) ) - def get_user_status( + def get_user_usage( self, user_id=Nonnegative ): diff --git a/snf-astakos-app/astakos/im/templates/im/resource_list.html b/snf-astakos-app/astakos/im/templates/im/resource_usage.html similarity index 100% rename from snf-astakos-app/astakos/im/templates/im/resource_list.html rename to snf-astakos-app/astakos/im/templates/im/resource_usage.html diff --git a/snf-astakos-app/astakos/im/urls.py b/snf-astakos-app/astakos/im/urls.py index 25d29ff..3c5ccbd 100644 --- a/snf-astakos-app/astakos/im/urls.py +++ b/snf-astakos-app/astakos/im/urls.py @@ -49,7 +49,7 @@ urlpatterns = patterns('astakos.im.views', url(r'^approval_terms/?$', 'approval_terms', {}, name='latest_terms'), url(r'^approval_terms/(?P\d+)/?$', 'approval_terms'), url(r'^send/activation/(?P\d+)/?$', 'send_activation', {}, name='send_activation'), - url(r'^resources/?$', 'resource_list', {}, name='resource_list'), + url(r'^resources/?$', 'resource_usage', {}, name='resource_usage'), # url(r'^billing/?$', 'billing', {}, name='billing'), url(r'^timeline/?$', 'timeline', {}, name='timeline'), url(r'^group/add/complete/?$', 'group_add_complete', {}, name='group_add_complete'), diff --git a/snf-astakos-app/astakos/im/views.py b/snf-astakos-app/astakos/im/views.py index d67ea95..708549b 100644 --- a/snf-astakos-app/astakos/im/views.py +++ b/snf-astakos-app/astakos/im/views.py @@ -1274,7 +1274,7 @@ def disapprove_member(request, membership): @require_http_methods(["POST", "GET"]) @signed_terms_required @login_required -def resource_list(request): +def resource_usage(request): def with_class(entry): entry['load_class'] = 'red' max_value = float(entry['maxValue']) @@ -1293,7 +1293,7 @@ def resource_list(request): entry['plural'] = engine.plural(entry.get('name')) return entry - result = callpoint.get_user_status(request.user.id) + result = callpoint.get_user_usage(request.user.id) if result.is_success: backenddata = map(with_class, result.data) data = map(pluralize, result.data) @@ -1302,10 +1302,7 @@ def resource_list(request): messages.error(request, result.reason) resource_catalog = ResourcePresentation(RESOURCES_PRESENTATION_DATA) resource_catalog.update_from_result_report(result) - - - - return render_response('im/resource_list.html', + return render_response('im/resource_usage.html', data=data, context_instance=get_context(request), resource_catalog=resource_catalog, -- 1.7.10.4