@@ -, +, @@ FIRST SECOND THIRD FOURTH --- Koha/MetaSearcher.pm | 2 +- cataloguing/editor.pl | 2 +- .../intranet-tmpl/lib/koha/cateditor/search.js | 4 +-- .../prog/en/includes/cateditor-ui.inc | 33 ++++++++++++---------- svc/cataloguing/metasearch | 1 + 5 files changed, 23 insertions(+), 19 deletions(-) --- a/Koha/MetaSearcher.pm +++ a/Koha/MetaSearcher.pm @@ -127,7 +127,7 @@ sub search { extra => $2, id => $server_id, host => $server_id, - name => $server_id, + servername => $server_id, }; } } --- a/cataloguing/editor.pl +++ a/cataloguing/editor.pl @@ -81,7 +81,7 @@ my $dbh = C4::Context->dbh; $template->{VARS}->{z3950_servers} = $dbh->selectall_arrayref( q{ SELECT * FROM z3950servers WHERE recordtype != 'authority' AND servertype = 'zed' - ORDER BY servername + ORDER BY rank,servername }, { Slice => {} } ); output_html_with_http_headers $input, $cookie, $template->output; --- a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/search.js +++ a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/search.js @@ -73,8 +73,8 @@ define( [ 'koha-backend', 'marc-record' ], function( KohaBackend, MARC ) { var itemTag = KohaBackend.GetSubfieldForKohaField('items.itemnumber')[0]; - $.each( servers, function ( id, info ) { - if ( info.checked ) Search.includedServers.push( id ); + $.each( servers, function ( index, info ) { + if ( info.checked ) Search.includedServers.push( info.server_id ); } ); if ( Search.includedServers.length == 0 ) return false; --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc @@ -41,20 +41,22 @@ require.config( {