X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fhomeview.py;h=f830cc16f49e30509b2c90c98ca76d0fccbfe368;hb=cb3a40dfdc1c79ca57458d1c18732334d58734fd;hp=39e3c1812511feb9c9b15a267eb4a91ffc85ce5e;hpb=11ad57d19872deb23cfebc149952f094813bea9d;p=unfold.git diff --git a/portal/homeview.py b/portal/homeview.py index 39e3c181..f830cc16 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') @@ -97,8 +103,8 @@ class HomeView (FreeAccessView, ThemeView): def get (self, request, state=None): env = self.default_env() + acc_auth_cred={} if request.user.is_authenticated(): - acc_auth_cred='N/A' ## 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') @@ -107,7 +113,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'])