diff --git a/kfet/static/kfet/js/history.js b/kfet/static/kfet/js/history.js index 8efa120a..7048d121 100644 --- a/kfet/static/kfet/js/history.js +++ b/kfet/static/kfet/js/history.js @@ -79,6 +79,9 @@ function KHistory(options={}) { .find('.infos1').text(transfer['from_acc']).end() .find('.infos2').text(transfer['to_acc']).end(); + if (transfer['canceled_at']) + this.cancelOpe(transfer, $transfer_html); + return $transfer_html ; } @@ -151,9 +154,9 @@ function KHistory(options={}) { }); } - this.findOpe = function(id) { + this.findOpe = function(id, type) { return this.$container.find('.ope').filter(function() { - return $(this).data('ope') == id + return ($(this).data('id') == id && $(this).data('type') == type) }); } @@ -173,6 +176,6 @@ KHistory.default_options = { template_opegroup: '
', template_transfergroup: '
', template_ope: '
', - template_transfer: '
', + template_transfer: '
', display_trigramme: true, }