plugins.hazelnut: fixed to work without having a query

diff --git a/Makefile b/Makefile
index 74438a4..73f0bf9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -89,7 +89,10 @@ THIRD-PARTY-RESOURCES += $(shell ls third-party/smartwizard-1636c86/styles/smart
 THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery-notify/jquery.notify.js)
 THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery-notify/jquery.notify.min.js)
 THIRD-PARTY-RESOURCES += $(shell ls third-party/jquery-notify/ui.notify.css)
-
+# CodeMirror
+THIRD-PARTY-RESOURCES += $(shell ls third-party/codemirror-3.15/lib/codemirror.js) 
+THIRD-PARTY-RESOURCES += $(shell ls third-party/codemirror-3.15/lib/codemirror.css) 
+THIRD-PARTY-RESOURCES += $(shell ls third-party/codemirror-3.15/mode/sql/sql.js)
 
 thirdparty-js:
        @find $(THIRD-PARTY-RESOURCES) -name '*.js'

diff --git a/myslice/urls.py b/myslice/urls.py
index 8b1f31d..b37ee50 100644 (file)
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -49,5 +49,7 @@ urlpatterns = patterns(
     (r'^slice/(?P<slicename>[\w\.]+)/?$', 'trash.sliceview.slice_view'),
     # Portal
     url(r'^portal/', include('portal.urls')),
+    # Debug
+    url(r'^debug/', include('debug_platform.urls')),
 
 )

diff --git a/plugins/hazelnut/hazelnut.py b/plugins/hazelnut/hazelnut.py
index fa8fae5..a54cde7 100644 (file)
--- a/plugins/hazelnut/hazelnut.py
+++ b/plugins/hazelnut/hazelnut.py
@@ -5,15 +5,17 @@ class Hazelnut (Plugin):
     # set checkboxes if a final column with checkboxes is desired
     # pass columns as the initial set of columns
     #   if None then this is taken from the query's fields
-    def __init__ (self, query, query_all_uuid=None, checkboxes=False, columns=None, datatables_options={}, **settings):
+    def __init__ (self, query=None, query_all_uuid=None, checkboxes=False, columns=None, datatables_options={}, **settings):
         Plugin.__init__ (self, **settings)
         self.query          = query
         self.query_all_uuid = query_all_uuid
         self.checkboxes=checkboxes
         if columns is not None:
             self.columns=columns
-        else:
+        elif self.query:
             self.columns=self.query.fields
+        else:
+            self.columns = []
         self.datatables_options=datatables_options
 
     def template_file (self):

diff --git a/portal/views.py b/portal/views.py
index 9f31b7d..3254e9b 100644 (file)
--- a/portal/views.py
+++ b/portal/views.py
@@ -42,6 +42,7 @@ class DashboardView(TemplateView):
 
     def get_context_data(self, **kwargs):
         user_hrn = 'ple.upmc.jordan_auge'
+        #user_hrn = 'iotlab.auge'
 
         #messages.info(self.request, 'You have logged in')
         page = Page(self.request)

diff --git a/trash/sliceview.py b/trash/sliceview.py
index 0036221..759d20b 100644 (file)
--- a/trash/sliceview.py
+++ b/trash/sliceview.py
@@ -256,113 +256,6 @@ def _slice_view (request, slicename):
     ))
     
 
-    # END OF JORDAN's CODE
-
-#old#    main_plugin = Stack (
-#old#        page=page,
-#old#        title="Slice view for %s"%slicename,
-#old#        domid='thestack',
-#old#        togglable=False,
-#old#        sons=[
-#old#            Raw (page=page,togglable=False, toggled=True,html="<h2> Slice page for %s</h2>"%slicename),
-#old#            Messages (
-#old#                page=page,
-#old#                title="Runtime messages for slice %s"%slicename,
-#old#                domid="msgs-pre",
-#old#                levels="ALL",
-#old#                ),
-#old#            Tabs (
-#old#                page=page,
-#old#                title="2 tabs : w/ and w/o checkboxes",
-#old#                domid='thetabs',
-#old#                # active_domid='checkboxes',
-#old#                active_domid='gmap',
-#old#                sons=[
-#old#                    Hazelnut ( 
-#old#                        page=page,
-#old#                        title='a sample and simple hazelnut',
-#old#                        domid='simple',
-#old#                        # tab's sons preferably turn this off
-#old#                        togglable=False,
-#old#                        # this is the query at the core of the slice list
-#old#                        query=main_query,
-#old#                        ),
-#old#                    Hazelnut ( 
-#old#                        page=page,
-#old#                        title='with checkboxes',
-#old#                        domid='checkboxes',
-#old#                        # tab's sons preferably turn this off
-#old#                        togglable=False,
-#old#                        # this is the query at the core of the slice list
-#old#                        query=main_query,
-#old#                        checkboxes=True,
-#old#                        datatables_options = { 
-#old#                            # for now we turn off sorting on the checkboxes columns this way
-#old#                            # this of course should be automatic in hazelnut
-#old#                            'aoColumns' : [ None, None, None, None, {'bSortable': False} ],
-#old#                            'iDisplayLength' : 25,
-#old#                            'bLengthChange' : True,
-#old#                            },
-#old#                        ),
-#old#                    GoogleMap (
-#old#                        page=page,
-#old#                        title='geographic view',
-#old#                        domid='gmap',
-#old#                        # tab's sons preferably turn this off
-#old#                        togglable=False,
-#old#                        query=main_query,
-#old#                        # center on Paris
-#old#                        latitude=49.,
-#old#                        longitude=2.2,
-#old#                        zoom=3,
-#old#                        ),
-#old#                    Raw (
-#old##                    SensLabMap (
-#old#                        page=page,
-#old#                        title='3D view (disabled)',
-#old#                        domid='smap',
-#old##                        # tab's sons preferably turn this off
-#old#                        togglable=False,
-#old##                        query=main_query,
-#old#                        html="""<p class='well'>
-#old#Thierry: I am commeting off the use of <button class="btn btn-danger">SensLabMap</button> which,
-#old# although rudimentarily ported to the django framework, 
-#old#causes a weird behaviour especially wrt scrolling. 
-#old#On my Mac <button class="btn btn-warning"> I cannot use the mouse to scroll</button> any longer
-#old#if I keep this active, so for now it's disabled
-#old#</p>""",
-#old#                        ),
-#old#                    ]),
-#old#            Hazelnut ( 
-#old#                page=page,
-#old#                title='a hazelnut not in tabs',
-#old#                domid='standalone',
-#old#                # this is the query at the core of the slice list
-#old#                query=main_query,
-#old#                columns=['hrn','hostname'],
-#old#                ),
-#old#              # you don't *have to* set a domid, but if you plan on using toggled=persistent then it's required
-#old#              # because domid is the key for storing toggle status in the browser
-#old#            QueryCode (
-#old#                page=page,
-#old#                title='xmlrpc code (toggled=False)',
-#old#                query=main_query,
-#old##                domid='xmlrpc',
-#old#                toggled=False,
-#old#                ),
-#old#            QuickFilter (
-#old#                page=page,
-#old#                title="QuickFilter - requires metadata (toggled=False)",
-#old#                criterias=quickfilter_criterias,
-#old#                domid='filters',
-#old#                toggled=False,
-#old#                ),
-#old#            Messages (
-#old#                page=page,
-#old#                title="Runtime messages (again)",
-#old#                domid="msgs-post",
-#old#                )
-#old#              ])
 
     # variables that will get passed to the view-unfold1.html template
     template_env = {}

diff --git a/unfold/plugin.py b/unfold/plugin.py
index e15736d..de84878 100644 (file)
--- a/unfold/plugin.py
+++ b/unfold/plugin.py
@@ -176,7 +176,6 @@ class Plugin:
             env.update({'persistent_toggle':False,'display_hide_button':True,'display_show_button':False,'display_body':True})
         if self.need_debug(): 
             print "rendering plugin.html with env keys %s"%env.keys()
-            print "rendering plugin.html with env"
             for (k,v) in env.items(): 
                 if "display" in k or "persistent" in k: print k,'->',v
         result = render_to_string ('plugin.html',env)