@@ -, +, @@
popup/modal
---
.../prog/en/includes/patron-search.inc | 21 ++++++++++---------
1 file changed, 11 insertions(+), 10 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -596,13 +596,9 @@
[% FOR action IN actions %]
[% SWITCH action %]
[% CASE 'select' %]
- let patron_str = JSON.stringify(row);
action_node += '' + _("Select") + '';
- let input_node = $('');
- $(input_node).val(patron_str);
- action_node += $(input_node).prop('outerHTML');
[% CASE 'add' %]
- action_node += '' + _("Add") + '';
+ action_node += '' + _("Add") + '';
[% CASE 'edit' %]
action_node += ' ' + _("Edit") + '';
[% CASE 'checkout' %]
@@ -611,6 +607,12 @@
[% END %]
[% END %]
[% END %]
+
+ let patron_str = JSON.stringify(row);
+ let input_node = $('');
+ $(input_node).val(patron_str);
+ action_node += $(input_node).prop('outerHTML');
+
return action_node;
},
"searchable": false,
@@ -647,16 +649,15 @@
$("body").on("click",".add_user",function(e){
e.preventDefault();
var borrowernumber = $(this).data("borrowernumber");
- var firstname = $(this).data("firstname");
- var surname = $(this).data("surname");
- add_user( borrowernumber, firstname + " " + surname );
+ var borrower_data = JSON.parse($("#borrower_data"+borrowernumber).val());
+ add_user( borrowernumber, borrower_data.firstname + " " + borrower_data.surname );
});
$("body").on("click",".select_user",function(e){
e.preventDefault();
var borrowernumber = $(this).data("borrowernumber");
- var borrower_data = $("#borrower_data"+borrowernumber).val();
- select_user( borrowernumber, JSON.parse(borrower_data) );
+ var borrower_data = JSON.parse($("#borrower_data"+borrowernumber).val());
+ select_user( borrowernumber, borrower_data );
});
$("body").on("click",".patron_preview", function( e ){
--