with checkboxes is desired
* optionally pass columns as the initial set of columns
if None then this is taken from the query's fields
-* id_key is the name of a column used internally in the plugin
- for checkboxes management. Caller should specify a column that is present
- in the fields returned by 'query' and that has unique values.
+* init_key is the name of a column that should appear in both queries
+ and used internally in the plugin for checkboxes initialization.
If not specified, metadata will be used to find out a primary key.
However in the case of nodes & slice for example, the default key
- as returned by the metadata would be 'urn', but it is not necessarily
- a good idea to show urn's initially - if at all.
+ as returned by the metadata would be 'urn', but 'urn' could only
+ be used for this purpose if it gets displayed initially, which is
+ not necessarily a good idea.
This is why a slice view would use 'hrn' here instead.
* datatables_options are passed to dataTables as-is;
however please refrain from passing an 'aoColumns'
as we use 'aoColumnDefs' instead.
"""
+
def __init__ (self, query=None, query_all=None,
checkboxes=False, columns=None,
- id_key=None,
+ init_key=None,
datatables_options={}, **settings):
Plugin.__init__ (self, **settings)
self.query = query
self.query_all = query_all
self.query_all_uuid = query_all.query_uuid if query_all else None
self.checkboxes = checkboxes
+
# XXX We need to have some hidden columns until we properly handle dynamic queries
if columns is not None:
- self.columns=columns
- self.hidden_columns = []
+ _columns = columns
+ _hidden_columns = []
elif self.query:
- self.columns = self.query.fields
+ print "self.query.fields = ", self.query_all.fields
+ # Columns displayed by default
+ if self.default_fields is not None:
+ _columns = [field for field in self.default_fields if not field == 'urn']
+ else:
+ _columns = [field for field in self.query.fields if not field == 'urn']
if query_all:
# We need a list because sets are not JSON-serializable
- self.hidden_columns = list(self.query_all.fields - self.query.fields)
+ if self.default_fields is not None:
+ print self.query_all.fields
+ _hidden_columns = list(self.query_all.fields - set(self.default_fields))
+ else:
+ _hidden_columns = list(self.query_all.fields - self.query.fields)
+ _hidden_columns.append('urn')
else:
- self.hidden_columns = []
+ _hidden_columns = []
else:
- self.columns = []
- self.hidden_columns = []
- self.id_key=id_key
+ _columns = []
+ _hidden_columns = []
+
+ print "_columns=", _columns
+ self.columns = { self.mapping.get(c, c) : c for c in _columns }
+ self.hidden_columns = { self.mapping.get(c, c) : c for c in _hidden_columns }
+ print "self.columns", self.columns
+ print "self.hidden_columns", self.hidden_columns
+
+ self.init_key=init_key
self.datatables_options=datatables_options
# if checkboxes were required, we tell datatables about this column's type
# so that sorting can take place on a selected-first basis (or -last of course)
aoColumnDefs = self.datatables_options.setdefault ('aoColumnDefs',[])
# here 'checkbox' is the class that we give to the <th> dom elem
# dom-checkbox is a sorting type that we define in querytable.js
- aoColumnDefs.append ( {'aTargets': ['checkbox'], 'sSortDataType': 'dom-checkbox' } )
+ #aoColumnDefs.insert (0, {'aTargets': ['checkbox'], 'sSortDataType': 'dom-checkbox' } )
def template_file (self):
return "querytable.html"
def requirements (self):
reqs = {
- 'js_files' : [ "js/spin.presets.js", "js/spin.min.js", "js/jquery.spin.js",
+ 'js_files' : [ "js/spin-presets.js", "js/spin.min.js", "js/jquery.spin.js",
"js/dataTables.js", "js/dataTables.bootstrap.js", "js/with-datatables.js",
"js/manifold.js", "js/manifold-query.js",
"js/unfold-helper.js",
# dataTableExt.afnSortData
"js/querytable.js",
] ,
- 'css_files': [ "css/dataTables.bootstrap.css",
+ 'css_files': [ #"css/dataTables.bootstrap.css",
# hopefully temporary, when/if datatables supports sPaginationType=bootstrap3
# for now we use full_numbers, with our own ad hoc css
- "css/dataTables.full_numbers.css",
+ #"css/dataTables.full_numbers.css",
"css/querytable.css" ,
],
}
return ['plugin_uuid', 'domid',
'query_uuid', 'query_all_uuid',
'checkboxes', 'datatables_options',
- 'hidden_columns', 'id_key',]
+ 'hidden_columns', 'init_key',]