X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=admin%2Fmarc_subfields_structure.pl;h=2c697333180483a20a50b9d8947487e9fa2c165e;hb=b946d16ec51467ffd4fd0f710b45e822b980033d;hp=7884d0bc2b7700d1de0dd903a2f6fe984e8196db;hpb=286c3c3a9e34f08da1fac8a48ce1925058a214ea;p=koha_fer

diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl
index 7884d0bc2b..2c69733318 100755
--- a/admin/marc_subfields_structure.pl
+++ b/admin/marc_subfields_structure.pl
@@ -13,11 +13,12 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
+#use warnings; FIXME - Bug 2505
 use C4::Output;
 use C4::Auth;
 use CGI;
@@ -75,7 +76,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         debug           => 1,
     }
 );
-my $pagesize = 30;
+
 my $op       = $input->param('op');
 $tagfield =~ s/\,//g;
 
@@ -174,16 +175,9 @@ if ( $op eq 'add_form' ) {
       );    # and tagsubfield='$tagsubfield'");
     $sth->execute( $tagfield, $frameworkcode );
     my @loop_data = ();
-    my $toggle    = 1;
     my $i         = 0;
     while ( $data = $sth->fetchrow_hashref ) {
         my %row_data;    # get a fresh hash for the row data
-        if ( $toggle eq 1 ) {
-            $toggle = 0;
-        }
-        else {
-            $toggle = 1;
-        }
         $row_data{defaultvalue} = $data->{defaultvalue};
         $row_data{tab} = CGI::scrolling_list(
             -name   => 'tab',
@@ -273,7 +267,6 @@ if ( $op eq 'add_form' ) {
             -label    => ''
         );
         $row_data{row}    = $i;
-        $row_data{toggle} = $toggle;
         $row_data{link}   = CGI::escapeHTML( $data->{'link'} ); 
         push( @loop_data, \%row_data );
         $i++;
@@ -368,13 +361,11 @@ if ( $op eq 'add_form' ) {
             -multiple => 0,
         );
         $row_data{link}   = CGI::escapeHTML( $data->{'link'} );
-        $row_data{toggle} = $toggle;
         $row_data{row}    = $j;
         push( @loop_data, \%row_data );
-        use Data::Dumper;
     }
-    $template->param( 'use-heading-flags-p'      => 1 );
-    $template->param( 'heading-edit-subfields-p' => 1 );
+    $template->param( 'use_heading_flags_p'      => 1 );
+    $template->param( 'heading_edit_subfields_p' => 1 );
     $template->param(
         action   => "Edit subfields",
         tagfield => $tagfield,
@@ -435,7 +426,7 @@ elsif ( $op eq 'add_validate' ) {
         my $link   = $link[$i];
         my $defaultvalue = $defaultvalue[$i];
         
-        if ($liblibrarian) {
+        if (defined($liblibrarian) && $liblibrarian ne "") {
             unless ( C4::Context->config('demo') eq 1 ) {
                 if (marc_subfield_structure_exists($tagfield, $tagsubfield, $frameworkcode)) {
                     $sth_update->execute(
@@ -539,20 +530,8 @@ elsif ( $op eq 'delete_confirmed' ) {
 }
 else {    # DEFAULT
     my ( $count, $results ) = string_search( $tagfield, $frameworkcode );
-    my $toggle    = 1;
     my @loop_data = ();
-    for (
-        my $i = $offset ;
-        $i < ( $offset + $pagesize < $count ? $offset + $pagesize : $count ) ;
-        $i++
-      )
-    {
-        if ( $toggle eq 1 ) {
-            $toggle = 0;
-        }
-        else {
-            $toggle = 1;
-        }
+    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'};
@@ -568,11 +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";
-        $row_data{toggle} = $toggle;
 
         if ( $row_data{tab} eq -1 ) {
             $row_data{subfield_ignored} = 1;
@@ -586,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;