[Koha-patches] [PATCH] [SIGNED-OFF] Fix for Bug 5240 - next link hidden on edit subfields

[Nicole Engard]

From: Owen Leonard <oleonard at myacpl.org>

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 <nengard at bywatersolutions.com>
---
 admin/marc_subfields_structure.pl                  |   23 +------------------
 .../en/modules/admin/marc_subfields_structure.tmpl |    2 +-
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl
index bae9c65..372a811 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&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;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
index 2ea58de..201aad5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
@@ -207,7 +207,7 @@
             <!-- TMPL_IF NAME="link" --> | Link:<!-- TMPL_VAR NAME="link" -->,<!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
     </td>
-    <td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
+    <td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=delete_confirm&amp;tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;tagsubfield=<!-- TMPL_VAR NAME="tagsubfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">Delete</a></td>
 </tr>
 <!-- /TMPL_LOOP -->
 </table>
-- 
1.5.6.5