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

Merge remote branch 'kc/new/bug_5240' into kcmaster

Browse source
This commit is contained in:
Chris Cormack 2011-01-10 09:16:50 +13:00
commit a75a9264e1
1 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
admin/marc_subfields_structure.pl
View file

@ -76,7 +76,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
debug => 1,
}
);
my $pagesize = 30;
my $op = $input->param('op');
$tagfield =~ s/\,//g;
@ -531,12 +531,7 @@ elsif ( $op eq 'delete_confirmed' ) {
else { # DEFAULT
my ( $count, $results ) = string_search( $tagfield, $frameworkcode );
my @loop_data = ();
for (
my $i = $offset ;
$i < ( $offset + $pagesize < $count ? $offset + $pagesize : $count ) ;
$i++
)
{
for ( my $i = 0; $i < $count; $i++ ) {
my %row_data; # get a fresh hash for the row data
$row_data{tagfield} = $results->[$i]{'tagfield'};
$row_data{tagsubfield} = $results->[$i]{'tagsubfield'};
@ -552,10 +547,6 @@ else { # DEFAULT
$row_data{hidden} = $results->[$i]{'hidden'};
$row_data{isurl} = $results->[$i]{'isurl'};
$row_data{link} = $results->[$i]{'link'};
$row_data{delete} =
"$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield="
. $results->[$i]{'tagsubfield'}
. "&amp;frameworkcode=$frameworkcode";
if ( $row_data{tab} eq -1 ) {
$row_data{subfield_ignored} = 1;
@ -569,16 +560,6 @@ else { # DEFAULT
edit_frameworkcode => $frameworkcode
);
if ( $offset > 0 ) {
my $prevpage = $offset - $pagesize;
$template->param(
prev => "<a href=\"$script_name?offset=$prevpage\&tagfield=$tagfield\&frameworkcode=$frameworkcode \">" );
}
if ( $offset + $pagesize < $count ) {
my $nextpage = $offset + $pagesize;
$template->param(
next => "<a href=\"$script_name?offset=$nextpage\&tagfield=$tagfield\&frameworkcode=$frameworkcode \">" );
}
} #---- END $OP eq DEFAULT
output_html_with_http_headers $input, $cookie, $template->output;