diff --git a/kfet/static/kfet/js/history.js b/kfet/static/kfet/js/history.js index 15e63438..5b6ec75b 100644 --- a/kfet/static/kfet/js/history.js +++ b/kfet/static/kfet/js/history.js @@ -91,7 +91,7 @@ class KHistory { if (!to_update) return false; - $.extend(to_update, update_data); + to_update.update(update_data); var $new_elt = to_update.display($(this.templates[type]), {}); var $to_replace = this._$container.find('#'+type+'-'+id+'>:first-child'); @@ -109,7 +109,7 @@ class KHistory { if (options.to && dateUTCToParis(opegroup.at).isAfter(moment(options.to))) return false; - if (options.transfersonly && opegroup.constructor.verbose_name === 'opegroup') + if (options.transfersonly && opegroup.constructor.verbose_name == 'opegroup') return false; if (options.accounts && options.accounts.length && @@ -117,7 +117,7 @@ class KHistory { return false; if (options.checkouts && options.checkouts.length && - (opegroup.modelname === 'transfergroup' || + (opegroup.modelname == 'transfergroup' || options.checkouts.indexOf(opegroup.checkout_id) < 0)) return false;