Commit 8e8e305d authored by Sven Franck's avatar Sven Franck

app: fixed parseQuery not handling select_list

parent 92bf8ace
...@@ -1311,6 +1311,7 @@ ...@@ -1311,6 +1311,7 @@
"data-reference": spec.reference || null "data-reference": spec.reference || null
} }
})); }));
return pass(container); return pass(container);
}; };
...@@ -4207,7 +4208,7 @@ ...@@ -4207,7 +4208,7 @@
/** /**
* Build a query object based on passed configuration * Build a query object based on passed configuration
* @method parseQuery * @method parseQuery
* @param {object} config JSON parameters for query object * @param {object} query
* @param {string} type Portal Type to fetch * @param {string} type Portal Type to fetch
* @param {string} key Parameter to search single column * @param {string} key Parameter to search single column
* @param {string} value Value to search for across one or all columns * @param {string} value Value to search for across one or all columns
...@@ -4215,7 +4216,7 @@ ...@@ -4215,7 +4216,7 @@
* @param {array} restore Initial query identifier (key) and value * @param {array} restore Initial query identifier (key) and value
* @return {object} query object * @return {object} query object
*/ */
// WARNING: complex_queries dependency! // WARNING: jIO dependency!
storage.parseQuery = function (query, type, key, value, field_list, restore) { storage.parseQuery = function (query, type, key, value, field_list, restore) {
var property, wrap, query_object, query_clean, default_query, obj, var property, wrap, query_object, query_clean, default_query, obj,
is_value, i, is_id, decode; is_value, i, is_id, decode;
...@@ -4236,7 +4237,7 @@ ...@@ -4236,7 +4237,7 @@
// query string passed? parse it // query string passed? parse it
if (default_query.query) { if (default_query.query) {
query_clean = default_query.query.replace(/'/g, '"'); query_clean = default_query.query.replace(/'/g, '"');
query_object = complex_queries.QueryFactory.create(query_clean); query_object = jIO.QueryFactory.create(query_clean);
obj.query = '('; obj.query = '(';
// missing portal type? // missing portal type?
...@@ -5971,7 +5972,7 @@ ...@@ -5971,7 +5972,7 @@
if (pass.config_dict.initial_query) { if (pass.config_dict.initial_query) {
pass.state.initial_query = pass.config_dict.initial_query; pass.state.initial_query = pass.config_dict.initial_query;
pass.state.query = storage.parseQuery( pass.state.query = storage.parseQuery(
{"query": pass.config_dict.initial_query.query}, pass.config_dict.initial_query,
pass.config_dict.portal_type_source, pass.config_dict.portal_type_source,
pass.config_dict.property_dict.initial_query_url_identifier, pass.config_dict.property_dict.initial_query_url_identifier,
pass.data_dict.value pass.data_dict.value
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment