Merge branch 'master' of git://git.onelab.eu/myslice
[unfold.git] / portal / sliceview.py
index 24567f3..97802f6 100644 (file)
@@ -1,31 +1,31 @@
 from django.template                 import RequestContext
 from django.shortcuts                import render_to_response
 
-from portal.templateviews            import LoginRequiredAutoLogoutView
+from unfold.loginrequired            import LoginRequiredAutoLogoutView
 
 from unfold.page                     import Page
 from manifold.core.query             import Query, AnalyzedQuery
 
 from myslice.viewutils               import topmenu_items, the_user
 
-from plugins.raw.raw                 import Raw
-from plugins.stack.stack             import Stack
-from plugins.tabs.tabs               import Tabs
+from plugins.raw                     import Raw
+from plugins.stack                   import Stack
+from plugins.tabs                    import Tabs
 from plugins.hazelnut                import Hazelnut 
 from plugins.resources_selected      import ResourcesSelected
-from plugins.googlemap              import GoogleMap
+from plugins.googlemap               import GoogleMap
 from plugins.senslabmap.senslabmap   import SensLabMap
-from plugins.querycode.querycode     import QueryCode
+from plugins.querycode               import QueryCode
 from plugins.query_editor            import QueryEditor
 from plugins.active_filters          import ActiveFilters
-from plugins.quickfilter.quickfilter import QuickFilter
-from plugins.messages.messages       import Messages
-#from plugins.updater                 import Updater
+from plugins.quickfilter             import QuickFilter
+from plugins.messages                import Messages
 
 tmp_default_slice='ple.upmc.myslicedemo'
 
 # temporary : turn off the users part to speed things up
-do_query_users=True
+#do_query_users=True
+do_query_users=False
 
 class SliceView (LoginRequiredAutoLogoutView):
 
@@ -33,6 +33,7 @@ class SliceView (LoginRequiredAutoLogoutView):
     
         page = Page(request)
         page.add_css_files ('css/slice-view.css')
+        page.add_js_files  ( [ "js/common.functions.js" ] )
         page.add_js_chunks ('$(function() { console.log("sliceview: jQuery version " + $.fn.jquery); });')
         page.add_js_chunks ('$(function() { console.log("sliceview: users turned %s"); });'%("on" if do_query_users else "off"))
         page.expose_js_metadata()
@@ -144,7 +145,7 @@ class SliceView (LoginRequiredAutoLogoutView):
 
         resources_query_editor = QueryEditor(
             page  = page,
-            query = sq_resource,
+            query = query_resource_all,
             title = "Select Columns",
             )
         resources_active_filters = ActiveFilters(