From: Yasin Date: Tue, 1 Jul 2014 12:10:45 +0000 (+0200) Subject: Topmeny fix for pi X-Git-Tag: myslice-1.1~60^2~16 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7be57c9d8e23d9829bc54bc98ec74b8345786b7a;p=myslice.git Topmeny fix for pi --- diff --git a/portal/homeview.py b/portal/homeview.py index 49aad8f6..029dc316 100644 --- a/portal/homeview.py +++ b/portal/homeview.py @@ -80,9 +80,6 @@ class HomeView (FreeAccessView, ThemeView): else: pi = "is_pi" - print "testing" - print pi - env['pi'] = pi else: env['person'] = None diff --git a/portal/supportview.py b/portal/supportview.py index 5bd0d754..f97705d5 100644 --- a/portal/supportview.py +++ b/portal/supportview.py @@ -5,10 +5,12 @@ 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 from manifoldapi.manifoldresult import ManifoldResult +from manifold.core.query import Query +from manifoldapi.manifoldapi import execute_query from ui.topmenu import topmenu_items, the_user from myslice.configengine import ConfigEngine @@ -29,6 +31,24 @@ class SupportView (FreeAccessView, ThemeView): if request.user.is_authenticated(): env['person'] = self.request.user + ## 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') + platform_details = execute_query(self.request, platform_query) + account_details = execute_query(self.request, account_query) + for platform_detail in platform_details: + for account_detail in account_details: + 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']) + if 'myslice' in platform_detail['platform']: + acc_auth_cred = account_config.get('delegated_authority_credentials','N/A') + # assigning values + if acc_auth_cred == {}: + pi = "is_not_pi" + else: + pi = "is_pi" + env['pi'] = pi else: env['person'] = None