diff --git a/web_timeline/__manifest__.py b/web_timeline/__manifest__.py index e376f9af6..399a8d86b 100644 --- a/web_timeline/__manifest__.py +++ b/web_timeline/__manifest__.py @@ -4,7 +4,7 @@ { 'name': "Web timeline", 'summary': "Interactive visualization chart to show events in time", - "version": "12.0.1.0.2", + "version": "12.0.1.0.3", "development_status": "Production/Stable", 'author': 'ACSONE SA/NV, ' 'Tecnativa, ' diff --git a/web_timeline/i18n/es.po b/web_timeline/i18n/es.po index e9038f342..48d148790 100644 --- a/web_timeline/i18n/es.po +++ b/web_timeline/i18n/es.po @@ -18,9 +18,14 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: web_timeline +#: selection:ir.ui.view,type:0 +msgid "Activity" +msgstr "" + #. module: web_timeline #. openerp-web -#: code:addons/web_timeline/static/src/js/timeline_controller.js:240 +#: code:addons/web_timeline/static/src/js/timeline_controller.js:243 #, fuzzy, python-format msgid "Are you sure you want to delete this record?" msgstr "¿Está seguro que desea eliminar este registro?" @@ -131,7 +136,7 @@ msgstr "" #. module: web_timeline #. openerp-web -#: code:addons/web_timeline/static/src/js/timeline_controller.js:243 +#: code:addons/web_timeline/static/src/js/timeline_controller.js:246 #, python-format msgid "Warning" msgstr "" diff --git a/web_timeline/i18n/fr.po b/web_timeline/i18n/fr.po index 8bbf89db1..6deaf855c 100644 --- a/web_timeline/i18n/fr.po +++ b/web_timeline/i18n/fr.po @@ -19,9 +19,14 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#. module: web_timeline +#: selection:ir.ui.view,type:0 +msgid "Activity" +msgstr "" + #. module: web_timeline #. openerp-web -#: code:addons/web_timeline/static/src/js/timeline_controller.js:240 +#: code:addons/web_timeline/static/src/js/timeline_controller.js:243 #, fuzzy, python-format msgid "Are you sure you want to delete this record?" msgstr "Êtes vous sûr de vouloir supprimer cet enregistrement ?" @@ -131,7 +136,7 @@ msgstr "" #. module: web_timeline #. openerp-web -#: code:addons/web_timeline/static/src/js/timeline_controller.js:243 +#: code:addons/web_timeline/static/src/js/timeline_controller.js:246 #, python-format msgid "Warning" msgstr "" diff --git a/web_timeline/i18n/hr.po b/web_timeline/i18n/hr.po index 8fccf7937..1357666e7 100644 --- a/web_timeline/i18n/hr.po +++ b/web_timeline/i18n/hr.po @@ -19,9 +19,14 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +#. module: web_timeline +#: selection:ir.ui.view,type:0 +msgid "Activity" +msgstr "" + #. module: web_timeline #. openerp-web -#: code:addons/web_timeline/static/src/js/timeline_controller.js:240 +#: code:addons/web_timeline/static/src/js/timeline_controller.js:243 #, fuzzy, python-format msgid "Are you sure you want to delete this record?" msgstr "Jeste li sigurni da želite brisati ovaj zapis?" @@ -131,7 +136,7 @@ msgstr "" #. module: web_timeline #. openerp-web -#: code:addons/web_timeline/static/src/js/timeline_controller.js:243 +#: code:addons/web_timeline/static/src/js/timeline_controller.js:246 #, python-format msgid "Warning" msgstr "" diff --git a/web_timeline/i18n/nl_NL.po b/web_timeline/i18n/nl_NL.po index 1dcf2be61..f2d5af06d 100644 --- a/web_timeline/i18n/nl_NL.po +++ b/web_timeline/i18n/nl_NL.po @@ -19,9 +19,14 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: web_timeline +#: selection:ir.ui.view,type:0 +msgid "Activity" +msgstr "" + #. module: web_timeline #. openerp-web -#: code:addons/web_timeline/static/src/js/timeline_controller.js:240 +#: code:addons/web_timeline/static/src/js/timeline_controller.js:243 #, fuzzy, python-format msgid "Are you sure you want to delete this record?" msgstr "Weet je zeker dat je dit record wil verwijderen?" @@ -131,7 +136,7 @@ msgstr "" #. module: web_timeline #. openerp-web -#: code:addons/web_timeline/static/src/js/timeline_controller.js:243 +#: code:addons/web_timeline/static/src/js/timeline_controller.js:246 #, python-format msgid "Warning" msgstr "" diff --git a/web_timeline/i18n/web_timeline.pot b/web_timeline/i18n/web_timeline.pot index 51bbae733..f750ffa1a 100644 --- a/web_timeline/i18n/web_timeline.pot +++ b/web_timeline/i18n/web_timeline.pot @@ -13,9 +13,14 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: web_timeline +#: selection:ir.ui.view,type:0 +msgid "Activity" +msgstr "" + #. module: web_timeline #. openerp-web -#: code:addons/web_timeline/static/src/js/timeline_controller.js:240 +#: code:addons/web_timeline/static/src/js/timeline_controller.js:243 #, python-format msgid "Are you sure you want to delete this record?" msgstr "" @@ -125,7 +130,7 @@ msgstr "" #. module: web_timeline #. openerp-web -#: code:addons/web_timeline/static/src/js/timeline_controller.js:243 +#: code:addons/web_timeline/static/src/js/timeline_controller.js:246 #, python-format msgid "Warning" msgstr "" diff --git a/web_timeline/static/src/js/timeline_controller.js b/web_timeline/static/src/js/timeline_controller.js index 2301fe54b..1e2969fed 100644 --- a/web_timeline/static/src/js/timeline_controller.js +++ b/web_timeline/static/src/js/timeline_controller.js @@ -37,9 +37,9 @@ odoo.define('web_timeline.TimelineController', function (require) { * @override */ update: function (params, options) { - this._super.apply(this, arguments); + var res = this._super.apply(this, arguments); if (_.isEmpty(params)){ - return; + return res; } var defaults = _.defaults({}, options, { adjust_window: true @@ -63,17 +63,20 @@ odoo.define('web_timeline.TimelineController', function (require) { var fields = this.renderer.fieldNames; fields = _.uniq(fields.concat(n_group_bys)); - self._rpc({ - model: self.model.modelName, - method: 'search_read', - kwargs: { - fields: fields, - domain: domains, - }, - context: self.getSession().user_context, - }).then(function(data) { - return self.renderer.on_data_loaded(data, n_group_bys, defaults.adjust_window); - }); + return $.when( + res, + self._rpc({ + model: self.model.modelName, + method: 'search_read', + kwargs: { + fields: fields, + domain: domains, + }, + context: self.getSession().user_context, + }).then(function (data) { + return self.renderer.on_data_loaded(data, n_group_bys, defaults.adjust_window); + }) + ); }, /**