keep only import topmenu_items, the_user in myslice/viewutils

[myslice.git] / trash / dashboard.py

diff --git a/trash/dashboard.py b/trash/dashboard.py
index 969149c..e996477 100644 (file)
--- a/trash/dashboard.py
+++ b/trash/dashboard.py
@@ -8,14 +8,15 @@ from django.shortcuts import render_to_response
 from django.contrib.auth.decorators import login_required
 
 from unfold.page import Page
 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.lists.slicelist import SliceList
 from plugins.querycode.querycode import QueryCode
 from plugins.quickfilter.quickfilter import QuickFilter
 
 
 from plugins.stack.stack import Stack
 from plugins.lists.slicelist import SliceList
 from plugins.querycode.querycode import QueryCode
 from plugins.quickfilter.quickfilter import QuickFilter
 

-from myslice.viewutils import quickfilter_criterias
+from trash.trashutils  import quickfilter_criterias

 
 # 
 from myslice.viewutils import topmenu_items, the_user
 
 # 
 from myslice.viewutils import topmenu_items, the_user


@@ -25,15 +26,12 @@ def dashboard_view (request):
     
     page = Page(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 (
     page.enqueue_query (slices_query)
 
     main_plugin = Stack (


@@ -42,11 +40,13 @@ def dashboard_view (request):
         sons=[ 
             QueryCode (
                 page=page,
         sons=[ 
             QueryCode (
                 page=page,

-                title="Vizualize your query (no syntax highlight for now)",
+                title="Vizualize your query",

                 query=slices_query,
                 toggled=False,
                 ),
             QuickFilter (
                 query=slices_query,
                 toggled=False,
                 ),
             QuickFilter (

+                # we play with this one for demo purposes in dashboard.css
+                domid='myquickfilter',

                 page=page,
                 title='play with filters',
                 criterias=quickfilter_criterias,
                 page=page,
                 title='play with filters',
                 criterias=quickfilter_criterias,


@@ -62,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 = {}
     
     template_env = {}
     

-    # define 'content_main' to the template engine
-    template_env [ 'content_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'
 
     # more general variables expected in the template
     template_env [ 'title' ] = 'Test view for a full request cycle'


@@ -87,13 +87,13 @@ def dashboard_view (request):
         query=slices_query,
         )
     # likewise but on the side view
         query=slices_query,
         )
     # likewise but on the side view

-    template_env [ 'content_related' ] = 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
     
     # 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
 
     # 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


@@ -102,5 +102,5 @@ def dashboard_view (request):
     # define {js,css}_{files,chunks}
     prelude_env = page.prelude_env()
     template_env.update(prelude_env)
     # 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))
                                context_instance=RequestContext(request))