From: Bernd Bleßmann Date: Mon, 25 Jan 2021 18:58:27 +0000 (+0100) Subject: PartPicker: Ergebnisse im Dialog nach Blättern initialisieren. X-Git-Tag: kivitendo-mebil_0.1-0~9^2~512 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=98fb2f04e9601da3cd725cb45f67f2e4d16118a2;p=kivitendo-erp.git PartPicker: Ergebnisse im Dialog nach Blättern initialisieren. Sonst kann man nur auf der ersten Seite Ergebnisse auswählen. Behebt #462 (redmine) --- diff --git a/js/kivi.Part.js b/js/kivi.Part.js index 4f813bbf4..ccc775a68 100644 --- a/js/kivi.Part.js +++ b/js/kivi.Part.js @@ -565,7 +565,9 @@ namespace('kivi.Part', function(ns) { var self = this; kivi.popup_dialog({ url: 'controller.pl?action=Part/part_picker_search', - data: self.pp.ajax_data(this.pp.$dummy.val()), + data: $.extend({ + real_id: self.pp.real_id, + }, self.pp.ajax_data(this.pp.$dummy.val())), id: 'part_selection', dialog: { title: kivi.t8('Part picker'), diff --git a/templates/webpages/part/_part_picker_result.html b/templates/webpages/part/_part_picker_result.html index ed8ad788e..cdcbf8d11 100644 --- a/templates/webpages/part/_part_picker_result.html +++ b/templates/webpages/part/_part_picker_result.html @@ -30,3 +30,6 @@
[% L.paginate_controls(target='#part_picker_result', selector='#part_picker_result', models=SELF.models) %] + diff --git a/templates/webpages/part/part_picker_search.html b/templates/webpages/part/part_picker_search.html index 49b08c40b..3147fd132 100644 --- a/templates/webpages/part/part_picker_search.html +++ b/templates/webpages/part/part_picker_search.html @@ -5,6 +5,7 @@
+[% L.hidden_tag('part_picker_real_id', FORM.real_id) %] [% LxERP.t8("Filter") %]: [% L.input_tag('part_picker_filter', search_term, class='part_picker_filter') %]