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 f1ce698..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,16 +26,12 @@ def dashboard_view (request):
     
     page = Page(request)
 
     
     page = Page(request)
 

-    slices_query = ManifoldQuery (action='get',
-                                  subject='slice',
-                                  timestamp='latest',
-                                  fields=['slice_hrn'],
-                                  filters=[],
-                                  # 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 (


@@ -43,7 +40,7 @@ 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,
                 ),
                 query=slices_query,
                 toggled=False,
                 ),


@@ -96,7 +93,7 @@ def dashboard_view (request):
     page.add_css_files ( 'css/dashboard.css')
     
     # don't forget to run the requests
     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