From bf62809c0b24c1b6cbe22a74f3adb86f9c479ba0 Mon Sep 17 00:00:00 2001 From: Yasin Date: Wed, 12 Mar 2014 15:18:40 +0100 Subject: [PATCH] Fix: manifold userlist. /portal/users --- portal/templates/usersview.html | 14 +------ portal/usersview.py | 72 ++++++++++++++++++--------------- 2 files changed, 42 insertions(+), 44 deletions(-) diff --git a/portal/templates/usersview.html b/portal/templates/usersview.html index f82d8656..8ac46094 100644 --- a/portal/templates/usersview.html +++ b/portal/templates/usersview.html @@ -1,15 +1,5 @@ -{# fine for either layout-unfold1.html (logged in) or layout-unfold2.html (needs a login prompt) #} -{% extends layout_1_or_2 %} - -{% block unfold_margin %} -{% include 'widget-login.html' %} -{% endblock unfold_margin %} - -{% block head %} - -{% endblock %} - -{% block unfold_main %} +{% extends "layout.html" %} +{% block content %}

MySlice Users

diff --git a/portal/usersview.py b/portal/usersview.py index 63954657..e8b7b684 100644 --- a/portal/usersview.py +++ b/portal/usersview.py @@ -1,29 +1,36 @@ +from django.contrib.auth import authenticate, login, logout +from django.template import RequestContext +from django.shortcuts import render, render_to_response + +from manifoldapi.manifoldresult import ManifoldResult +from ui.topmenu import topmenu_items, the_user +from myslice.configengine import ConfigEngine from manifold.core.query import Query from unfold.page import Page - -from ui.topmenu import topmenu_items_live, the_user from manifoldapi.manifoldapi import execute_admin_query - -from plugins.querytable import QueryTable from unfold.loginrequired import LoginRequiredAutoLogoutView -from theme import ThemeView - -from django.shortcuts import render, render_to_response +from theme import ThemeView import json -# View for platforms -class UsersView(LoginRequiredAutoLogoutView, ThemeView): - template_name = "usersview.html" - def dispatch(self, *args, **kwargs): - return super(UsersView, self).dispatch(*args, **kwargs) +class UsersView (LoginRequiredAutoLogoutView, ThemeView): + template_name = 'usersview.html' + + # expose this so we can mention the backend URL on the welcome page + def default_env (self): + return { + 'MANIFOLD_URL':ConfigEngine().manifold_url(), + } + + def post (self,request): + env = self.default_env() + env['theme'] = self.theme + return render_to_response(self.template, env, context_instance=RequestContext(request)) + def get (self, request, state=None): + env = self.default_env() + - def get_context_data(self, **kwargs): - page = Page(self.request) - page.add_js_files ( [ "js/common.functions.js" ] ) - #platform_query = Query().get('local:platform').filter_by('disabled', '==', '0').select('platform','platform_longname','gateway_type') - #platform_query = Query().get('local:platform').select('platform','platform_longname','gateway_type') email_list = [] status_list = [] authority_list = [] @@ -55,20 +62,21 @@ class UsersView(LoginRequiredAutoLogoutView, ThemeView): user_list = [{'email': t[0], 'status': t[1], 'authority':t[2]} for t in zip(email_list, status_list, authority_list)] - context = super(UsersView, self).get_context_data(**kwargs) - context['person'] = self.request.user - context['user_list'] = user_list - - # XXX This is repeated in all pages - # more general variables expected in the template - context['title'] = 'Users in MySlice' - # the menu items on the top - # so we can sho who is logged - context['username'] = the_user(self.request) - context['theme'] = self.theme + if request.user.is_authenticated(): + env['person'] = self.request.user + else: + env['person'] = None + + env['theme'] = self.theme + env['user_list']= user_list - context['layout_1_or_2']="layout-unfold2.html" if not context['username'] else "layout-unfold1.html" - #prelude_env = page.prelude_env() - #context.update(prelude_env) + env['username']=the_user(request) + env['topmenu_items'] = topmenu_items(None, request) + if state: env['state'] = state + elif not env['username']: env['state'] = None + # use one or two columns for the layout - not logged in users will see the login prompt + env['layout_1_or_2']="layout-unfold2.html" if not env['username'] else "layout-unfold1.html" + + + return render_to_response(self.template, env, context_instance=RequestContext(request)) - return render_to_response(self.template) -- 2.43.0