X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fhomeview.py;h=7af47760b121230625ac2d2983d6e120e5dfcff6;hb=bff32abff469690c249af3b4f1cbb6905bd70e0d;hp=b4faa8e2b978f82bc0f89c11e6d840996f622f42;hpb=4f57ece74f338bbbcebd044bbc0ef2aa06908701;p=unfold.git diff --git a/portal/homeview.py b/portal/homeview.py index b4faa8e2..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))