X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fviews.py;h=04dbec5a87a7328ad520e04cff39f00900163ddf;hb=5fa503e8ad5b16353ddb8b88eaa914c7a4ee5748;hp=d8c5501f714decb7a58fa2d0d6703f7de86f38cd;hpb=d62c8f827ab745a3e15f98c52d25e3888e2b604c;p=unfold.git diff --git a/portal/views.py b/portal/views.py index d8c5501f..04dbec5a 100644 --- a/portal/views.py +++ b/portal/views.py @@ -43,8 +43,8 @@ from portal.forms import SliceRequestForm, ContactForm from portal.util import RegistrationView, ActivationView from portal.models import PendingUser, PendingSlice from portal.actions import authority_get_pi_emails, get_request_by_authority, manifold_add_user, manifold_update_user -from manifold.core.query import Query from manifold.manifoldapi import execute_query +from manifold.core.query import Query from unfold.page import Page from myslice.viewutils import topmenu_items, the_user from django.http import HttpResponseRedirect, HttpResponse @@ -52,61 +52,6 @@ from django.http import HttpResponseRedirect, HttpResponse from M2Crypto import Rand, RSA, BIO import os, re -# View for platforms -class PlatformsView(TemplateView): - template_name = "platforms.html" - - def get_context_data(self, **kwargs): - page = Page(self.request) - - #network_query = Query().get('local:platform').filter_by('disabled', '==', '0').select('platform','platform_longname','gateway_type') - network_query = Query().get('local:platform').select('platform','platform_longname','gateway_type') - page.enqueue_query(network_query) - - page.expose_js_metadata() - page.expose_queries() - networklist = Hazelnut( - page = page, - title = 'List', - domid = 'checkboxes', - # this is the query at the core of the slice list - query = network_query, - query_all = network_query, - checkboxes = False, - datatables_options = { - # for now we turn off sorting on the checkboxes columns this way - # this of course should be automatic in hazelnut - 'aoColumns' : [None, None, None, None, {'bSortable': False}], - 'iDisplayLength' : 25, - 'bLengthChange' : True, - }, - ) -# -# networklist = SimpleList( -# title = None, -# page = page, -# key = 'platform', -# query = network_query, -# ) - - context = super(PlatformsView, self).get_context_data(**kwargs) - context['person'] = self.request.user - context['networks'] = networklist.render(self.request) - - # XXX This is repeated in all pages - # more general variables expected in the template - context['title'] = 'Platforms connected to MySlice' - # the menu items on the top - context['topmenu_items'] = topmenu_items('Platforms', self.request) - # so we can sho who is logged - context['username'] = the_user(self.request) - - context.update(page.prelude_env()) - - return context - - - # View for 1 platform and its details class PlatformView(TemplateView): template_name = "platform.html"