Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 4189 : Searching z39.50 without selecting any servers results in error message

Browse source 
This patch makes z3950_search.pl handle the situation properly, and z3950_search.tmpl
show a proper message instead of a program error. All this, in case the javascript
checks that alert the user (that at least one target has to be chosen)  are by-passed.

Regards
To+

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed small translation problem in javascript alert message.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This commit is contained in:
Tomás Cohen Arazi 2011-03-30 17:08:57 -03:00 committed by Chris Cormack
parent 65c21fa52f
commit 4747f5adb2
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cataloguing/z3950_search.pl
View file

@ -103,6 +103,14 @@ if ( $op ne "do_search" ) {
}
else {
my @id = $input->param('id');
if ( not defined @id ) {
# empty server list -> report and exit
$template->param( emptyserverlist => 1 );
output_html_with_http_headers $input, $cookie, $template->output;
exit;
}
my @oConnection;
my @oResult;
my @errconn;

18
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tmpl
View file

@ -22,6 +22,7 @@ function closemenu(){
$(".linktools").hide();
$("tr").removeClass("selected");
}
$(document).ready(function(){
$("#CheckAll").click(function(){
$(".checkboxed").checkCheckboxes();
@ -52,6 +53,13 @@ $(document).ready(function(){
var row = $(this).parent();
row.addClass("selected");
});
$("form[name='f']").submit(function(){
if ($('input[type=checkbox]').filter(':checked').length == 0) {
alert(_("Please choose at least one Z39.50 target"));
return false;
} else
return true;
});
});
//]]>
@ -153,9 +161,13 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
<!-- /TMPL_LOOP --></tbody>
</table>
<!-- TMPL_ELSE -->
<!-- TMPL_LOOP name="errconn" -->
Connection failed to <!-- TMPL_VAR NAME="server" -->
<!-- /TMPL_LOOP -->
<!-- TMPL_IF NAME="emptyserverlist" -->
You didn't select any Z39.50 target.
<!-- TMPL_ELSE -->
<!-- TMPL_LOOP name="errconn" -->
Connection failed to <!-- TMPL_VAR NAME="server" -->
<!-- /TMPL_LOOP -->
<!-- /TMPL_IF -->
<p>Nothing found. <a href="/cgi-bin/koha/cataloguing/z3950_search.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Try another search</a>.</p>
<!-- /TMPL_IF -->