X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=trash%2Fdashboard.py;h=08a630dbaf2dc90ab12d0528765555c5057eada6;hb=e662708d2f2f1ba05daefe1db50ee08c5439aadc;hp=2dd417e7b0435e783636fe0214b8a23ded1a772b;hpb=62377256bf242f91f477a1896c6c0f670a0db5a1;p=myslice.git

diff --git a/trash/dashboard.py b/trash/dashboard.py
index 2dd417e7..08a630db 100644
--- a/trash/dashboard.py
+++ b/trash/dashboard.py
@@ -8,32 +8,30 @@ from django.shortcuts import render_to_response
 from django.contrib.auth.decorators import login_required
 
 from unfold.page import Page
-from manifold.manifoldquery import ManifoldQuery
+from manifold.core.query import Query
+#from manifold.manifoldquery import ManifoldQuery
 
-from plugins.stack.stack import Stack
+from plugins.stack import Stack
 from plugins.lists.slicelist import SliceList
-from plugins.querycode.querycode import QueryCode
-from plugins.quickfilter.quickfilter import QuickFilter
+from plugins.querycode import QueryCode
+from plugins.quickfilter import QuickFilter
 
-from myslice.viewutils import quickfilter_criterias
+from trash.trashutils import quickfilter_criterias
 
 # 
-from myslice.viewutils import topmenu_items, the_user
+from ui.topmenu import topmenu_items, the_user
 
 @login_required
 def dashboard_view (request):
     
     page = Page(request)
 
-    slices_query = ManifoldQuery (action='get',
-                                  method='slice',
-                                  timestamp='latest',
-                                  fields=['slice_hrn'],
-                                  # xxx filter : should filter on the slices the logged user can see
-                                  # we don't have the user's hrn yet
-                                  # in addition this currently returns all slices anyways
-                                  # filter = ...
-                                  sort='slice_hrn',)
+    slices_query = Query.get('slice').select('slice_hrn')
+#old#                                  # xxx filter : should filter on the slices the logged user can see
+#old#                                  # we don't have the user's hrn yet
+#old#                                  # in addition this currently returns all slices anyways
+#old#                                  # filter = ...
+#old#                                  sort='slice_hrn',)
     page.enqueue_query (slices_query)
 
     main_plugin = Stack (
@@ -42,7 +40,7 @@ def dashboard_view (request):
         sons=[ 
             QueryCode (
                 page=page,
-                title="Vizualize your query (no syntax highlight for now)",
+                title="Vizualize your query",
                 query=slices_query,
                 toggled=False,
                 ),
@@ -64,11 +62,11 @@ def dashboard_view (request):
                 ),
             ])
 
-    # variables that will get passed to the view-plugin.html template
+    # variables that will get passed to the view-unfold2.html template
     template_env = {}
     
-    # define 'unfold1_main' to the template engine
-    template_env [ 'unfold1_main' ] = main_plugin.render(request)
+    # define 'unfold2_main' to the template engine
+    template_env [ 'unfold2_main' ] = main_plugin.render(request)
 
     # more general variables expected in the template
     template_env [ 'title' ] = 'Test view for a full request cycle'
@@ -89,13 +87,13 @@ def dashboard_view (request):
         query=slices_query,
         )
     # likewise but on the side view
-    template_env [ 'unfold1_margin' ] = related_plugin.render (request)
+    template_env [ 'unfold2_margin' ] = related_plugin.render (request)
     
     # add our own css in the mix
     page.add_css_files ( 'css/dashboard.css')
     
     # don't forget to run the requests
-    page.exec_queue_asynchroneously ()
+    page.expose_queries ()
 
     # xxx create another plugin with the same query and a different layout (with_datatables)
     # show that it worls as expected, one single api call to backend and 2 refreshed views
@@ -104,5 +102,5 @@ def dashboard_view (request):
     # define {js,css}_{files,chunks}
     prelude_env = page.prelude_env()
     template_env.update(prelude_env)
-    return render_to_response ('view-plugin.html',template_env,
+    return render_to_response ('view-unfold2.html',template_env,
                                context_instance=RequestContext(request))