Bugzilla – Attachment 2663 Details for
Bug 5240
next link hidden on edit subfields
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed fix
0001-Fix-for-Bug-5240-next-link-hidden-on-edit-subfields.patch (text/plain), 3.54 KB, created by
Owen Leonard
on 2010-10-04 15:12:52 UTC
(
hide
)
Description:
Proposed fix
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2010-10-04 15:12:52 UTC
Size:
3.54 KB
patch
obsolete
>From c03c34357fc26ad1ca2bb4939d39b21629bc41be Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 4 Oct 2010 11:10:08 -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. >--- > 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&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 => "<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&tagfield=<!-- TMPL_VAR NAME="tagfield" -->&tagsubfield=<!-- TMPL_VAR NAME="tagsubfield" -->&frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">Delete</a></td> > </tr> > <!-- /TMPL_LOOP --> > </table> >-- >1.7.0.4 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 5240
:
2642
| 2663