From 88a15a71d5fd874acf06b3f73e567ac07b2e785b Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 4 Oct 2010 11:23:22 -0400 Subject: [PATCH] Fix for Bug 5240 - next link hidden on edit subfields This patch removes the pagination altogether, displaying everything on one page. It also moves some HTML out of the script and into the template. Signed-off-by: Nicole Engard Signed-off-by: Chris Cormack --- admin/marc_subfields_structure.pl | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl index bae9c6501e..372a8114c6 100755 --- a/admin/marc_subfields_structure.pl +++ b/admin/marc_subfields_structure.pl @@ -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&tagfield=$tagfield&tagsubfield=" - . $results->[$i]{'tagsubfield'} - . "&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 => "" ); - } - if ( $offset + $pagesize < $count ) { - my $nextpage = $offset + $pagesize; - $template->param( - next => "" ); - } } #---- END $OP eq DEFAULT output_html_with_http_headers $input, $cookie, $template->output; -- 2.39.5