X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fquerytable%2F__init__.py;h=995e935ee6116649a2383b7d9ad3b004786c07c9;hb=261afa50a6fade31685a23b104ab919bebaf25ef;hp=b435b38e345e3877252cd68a2082a9ab068106f5;hpb=ef9e572f3c703640218a44ea7f86aa71805cbcfe;p=myslice.git diff --git a/plugins/querytable/__init__.py b/plugins/querytable/__init__.py index b435b38e..995e935e 100644 --- a/plugins/querytable/__init__.py +++ b/plugins/querytable/__init__.py @@ -33,6 +33,13 @@ Current implementation makes the following assumptions as we use 'aoColumnDefs' instead. """ + MAP = { + 'facility_name' : 'Facility', + 'testbed_name' : 'Testbed', + 'hostname' : 'Resource name', + 'type' : 'Type', + } + def __init__ (self, query=None, query_all=None, checkboxes=False, columns=None, init_key=None, @@ -43,20 +50,28 @@ Current implementation makes the following assumptions 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 + _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) + _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 = [] + _columns = [] + _hidden_columns = [] + + print "_columns=", _columns + self.columns = { self.MAP.get(c, c) : c for c in _columns } + self.hidden_columns = { self.MAP.get(c, c) : c for c in _hidden_columns } + print "self.columns", self.columns + self.init_key=init_key self.datatables_options=datatables_options # if checkboxes were required, we tell datatables about this column's type @@ -71,7 +86,7 @@ Current implementation makes the following assumptions aoColumnDefs = self.datatables_options.setdefault ('aoColumnDefs',[]) # here 'checkbox' is the class that we give to the