X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fhomeview.py;h=7af47760b121230625ac2d2983d6e120e5dfcff6;hb=3ecc81f0804779ab298167f9ee5a79126e6b2572;hp=a910f74f2f7b2517b991d8abc881f5257c3f827f;hpb=64875671facb5f00ccd4cced2620a3fd23d09b07;p=myslice.git

diff --git a/portal/homeview.py b/portal/homeview.py
index a910f74f..7af47760 100644
--- a/portal/homeview.py
+++ b/portal/homeview.py
@@ -5,6 +5,7 @@ from django.contrib.auth import authenticate, login, logout
 from django.template import RequestContext
 from django.shortcuts import render_to_response
 from django.shortcuts import render
+
 import json
 
 from unfold.loginrequired import FreeAccessView
@@ -18,6 +19,8 @@ from myslice.configengine import ConfigEngine
 
 from myslice.theme import ThemeView
 
+import activity.user
+
 class HomeView (FreeAccessView, ThemeView):
     template_name = 'home-view.html'
         
@@ -62,6 +65,9 @@ class HomeView (FreeAccessView, ThemeView):
                     env['person'] = self.request.user
                     env['username'] = self.request.user
                     
+                    # log user activity
+                    activity.user.login(self.request)
+                    
                     ## check user is pi or not
                     platform_query  = Query().get('local:platform').select('platform_id','platform','gateway_type','disabled')
                     account_query  = Query().get('local:account').select('user_id','platform_id','auth_type','config')
@@ -85,12 +91,16 @@ class HomeView (FreeAccessView, ThemeView):
                     env['person'] = None
                 return render_to_response(self.template,env, context_instance=RequestContext(request))
             else:
+                # log user activity
+                activity.user.login(self.request, "notactive")
                 env['state'] = "Your account is not active, please contact the site admin."
                 env['layout_1_or_2']="layout-unfold2.html"
                 
                 return render_to_response(self.template,env, context_instance=RequestContext(request))
         # otherwise
         else:
+            # log user activity
+            activity.user.login(self.request, "error")
             env['state'] = "Your username and/or password were incorrect."
             
             return render_to_response(self.template, env, context_instance=RequestContext(request))
@@ -107,7 +117,7 @@ class HomeView (FreeAccessView, ThemeView):
             account_details = execute_query(self.request, account_query)
             for platform_detail in platform_details:
                 for account_detail in account_details:
-                    if 'platform_id' in platform_details:
+                    if 'platform_id' in platform_detail:
                         if platform_detail['platform_id'] == account_detail['platform_id']:
                             if 'config' in account_detail and account_detail['config'] is not '':
                                 account_config = json.loads(account_detail['config'])