Change menu ``Report`` to ``Usage``

[astakos] / snf-astakos-app / astakos / im / api / __init__.py

diff --git a/snf-astakos-app/astakos/im/api/__init__.py b/snf-astakos-app/astakos/im/api/__init__.py
index cace850..754f34f 100644 (file)
--- a/snf-astakos-app/astakos/im/api/__init__.py
+++ b/snf-astakos-app/astakos/im/api/__init__.py
@@ -112,7 +112,7 @@ def _get_user_by_email(email):
     if not email:
         raise BadRequest('Email missing')
     try:
-        user = AstakosUser.objects.get(email=email)
+        user = AstakosUser.objects.get(email__iexact=email)
     except AstakosUser.DoesNotExist:
         raise ItemNotFound('Invalid email')
 
@@ -156,18 +156,9 @@ def get_services(request):
 @api_method()
 def get_menu(request, with_extra_links=False, with_signout=True):
     user = request.user
-    if not isinstance(user, AstakosUser):
-        cookie = unquote(request.COOKIES.get(COOKIE_NAME, ''))
-        email = cookie.partition('|')[0]
-        try:
-            if email:
-                user = AstakosUser.objects.get(email=email, is_active=True)
-        except AstakosUser.DoesNotExist:
-            pass
-    if not isinstance(user, AstakosUser):
-        index_url = reverse('index')
-        l = [{'url': absolute(request, index_url), 'name': "Sign in"}]
-    else:
+    index_url = reverse('index')
+    l = [{'url': absolute(request, index_url), 'name': "Sign in"}]
+    if user.is_authenticated():
         l = []
         append = l.append
         item = MenuItem
@@ -178,52 +169,49 @@ def get_menu(request, with_extra_links=False, with_signout=True):
         append(item(url=absolute(request, reverse('edit_profile')),
                name="My account"))
         if with_extra_links:
-            """
             if user.has_usable_password() and user.provider in ('local', ''):
                 append(item(
                        url=absolute(request, reverse('password_change')),
                        name="Change password"))
-            """
             if EMAILCHANGE_ENABLED:
                 append(item(
                        url=absolute(request, reverse('email_change')),
                        name="Change email"))
-            """
             if INVITATIONS_ENABLED:
                 append(item(
                        url=absolute(request, reverse('invite')),
                        name="Invitations"))
-            """
             
             append(item(
                    url=absolute(request, reverse('group_list')),
-                   name="Groups",
-                   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"),)))
+                   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"),
+#                     )
+                )
+            )
             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"))
-            """
-            append(item(
-                   url=absolute(request, reverse('billing')),
-                   name="Billing"))
-            append(item(
-                   url=absolute(request, reverse('timeline')),
-                   name="Timeline"))
-            """
+#            append(item(
+#                   url=absolute(request, reverse('billing')),
+#                   name="Billing"))
+#            append(item(
+#                   url=absolute(request, reverse('timeline')),
+#                   name="Timeline"))
         if with_signout:
             append(item(
                    url=absolute(request, reverse('logout')),