diff --git a/languages/fr-fr.py b/languages/fr-fr.py index 31390cbe7c9b9e083e0bd55ba72d0e044dbba4ec..6881bba4511dd656eb0564cf985d47461e015ae2 100644 --- a/languages/fr-fr.py +++ b/languages/fr-fr.py @@ -93,7 +93,7 @@ 'select publications for a given team': 'selectionne les publications pour une équipe team', 'select publications with a given AERES code': 'selectionne les publications avec un code AERES', 'select publications with a given category code': 'select publications with a given category code', -'select...': 'select...', +'select...': 'sélectionner...', 'Speaker': 'Orateur', 'Start date': 'Date de début', 'Store': 'Store', diff --git a/static/plugin_dbui/src/grid/Filter.js b/static/plugin_dbui/src/grid/Filter.js index 72c2356efaedbec8c92c0304a8b1306f804ab07c..5a62b336d7ade8cd4dfaaecc5616dd6daad447ab 100644 --- a/static/plugin_dbui/src/grid/Filter.js +++ b/static/plugin_dbui/src/grid/Filter.js @@ -202,7 +202,7 @@ Ext.define('App.grid.Filter', { value = field.getValue(); // Clear an existing filter - if (filter && field.filterType === 'string' && value === "") { + if (Ext.isEmpty(value)) { store.removeFilter(filter); return; @@ -297,11 +297,11 @@ Ext.define('App.grid.Filter', { } // update the condition dictionary - where = field.name + " " + field.filterOperator + " '" + value + "'"; - - if (value === '') { + if (Ext.isEmpty(value)) { delete this.filterConditions[field.name]; + } else { + where = field.name + " " + field.filterOperator + " '" + value + "'"; this.filterConditions[field.name] = where; }