[Koha-cvs] CVS: koha/admin marc_subfields_structure.pl,1.1,1.2

[Paul POULAIN]

Update of /cvsroot/koha/koha/admin
In directory usw-pr-cvs1:/tmp/cvs-serv24774/admin

Modified Files:
        marc_subfields_structure.pl 
Log Message:
bugfixes + improvment in navigation

Index: marc_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** marc_subfields_structure.pl 7 Oct 2002 11:31:41 -0000       1.1
--- marc_subfields_structure.pl 11 Oct 2002 09:19:58 -0000      1.2
***************
*** 109,113 ****
                }
                $row_data{tab} = CGI::scrolling_list(-name=>'tab[]',
!                                       
-values=>['','0','1','2','3','4','5','6','7','8','9','items'],
                                        -default=>$data->{'tab'},
                                        -size=>1,
--- 109,118 ----
                }
                $row_data{tab} = CGI::scrolling_list(-name=>'tab[]',
!                                       
-values=>['','0','1','2','3','4','5','6','7','8','9','10'],
!                                       -labels => {'' =>'','0'=>'0','1'=>'1',
!                                                                       '2' 
=>'2','3'=>'3','4'=>'4',
!                                                                       '5' 
=>'5','6'=>'6','7'=>'7',
!                                                                       '8' 
=>'8','9'=>'9','10'=>'items (10)',
!                                                                       },
                                        -default=>$data->{'tab'},
                                        -size=>1,
***************
*** 132,136 ****
                my %row_data;  # get a fresh hash for the row data
                $row_data{tab} = CGI::scrolling_list(-name=>'tab[]',
!                                       
-values=>['','0','1','2','3','4','5','6','7','8','9','items'],
                                        -default=>"",
                                        -size=>1,
--- 137,141 ----
                my %row_data;  # get a fresh hash for the row data
                $row_data{tab} = CGI::scrolling_list(-name=>'tab[]',
!                                       
-values=>['','0','1','2','3','4','5','6','7','8','9','items (10)'],
                                        -default=>"",
                                        -size=>1,
***************
*** 142,146 ****
                $row_data{repeatable} = CGI::checkbox('repeatable[]','',1,'');
                $row_data{mandatory} = CGI::checkbox('mandatory[]','',1,'');
!               $row_data{kohafield} = '';
                $row_data{bgcolor} = $toggle;
                push(@loop_data, \%row_data);
--- 147,156 ----
                $row_data{repeatable} = CGI::checkbox('repeatable[]','',1,'');
                $row_data{mandatory} = CGI::checkbox('mandatory[]','',1,'');
!               $row_data{kohafield}= CGI::scrolling_list( -name=>'kohafield[]',
!                                       -values=> address@hidden,
!                                       -default=> "",
!                                       -size=>1,
!                                       -multiple=>0,
!                                       );
                $row_data{bgcolor} = $toggle;
                push(@loop_data, \%row_data);
***************
*** 163,167 ****
        my @kohafield           = $input->param('kohafield[]');
        my @tab                         = $input->param('tab[]');
-       warn "taille : $#tagsubfield";
        for (my $i=0; $i<= $#tagsubfield ; $i++) {
                my $tagfield                    =$input->param('tagfield');
--- 173,176 ----
***************
*** 185,189 ****
        }
        $sth->finish;
!       print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; 
URL=marctagstructure.pl\"></html>";
        exit;
  
--- 194,198 ----
        }
        $sth->finish;
!       print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; 
URL=marc_subfields_structure.pl?tagfield=$tagfield\"></html>";
        exit;
  
***************
*** 199,202 ****
--- 208,214 ----
        $template->param(liblibrarian => $data->{'liblibrarian'},
                                                        tagsubfield => 
$tagsubfield,
+                                                       delete_link => 
$script_name,
+                                                       tagfield      
=>$tagfield,
+                                                       tagsubfield => 
$tagsubfield,
                                                        );
                                                                                
                        # END $OP eq DELETE_CONFIRM
***************
*** 208,211 ****
--- 220,226 ----
        $sth->execute;
        $sth->finish;
+       print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; 
URL=marc_subfields_structure.pl?tagfield=$tagfield\"></html>";
+       exit;
+       $template->param(tagfield => $tagfield);
                                                                                
                        # END $OP eq DELETE_CONFIRMED
  ################## DEFAULT ##################################
***************
*** 229,233 ****
                $row_data{mandatory} = $results->[$i]{'mandatory'};
                $row_data{tab} = $results->[$i]{'tab'};
!               $row_data{delete} = 
"$script_name?op=delete_confirm&tagfield=$tagfield&tagsubfield=".$results->[$i]{'tagfield'};
                $row_data{bgcolor} = $toggle;
                push(@loop_data, \%row_data);
--- 244,248 ----
                $row_data{mandatory} = $results->[$i]{'mandatory'};
                $row_data{tab} = $results->[$i]{'tab'};
!               $row_data{delete} = 
"$script_name?op=delete_confirm&tagfield=$tagfield&tagsubfield=".$results->[$i]{'tagsubfield'};
                $row_data{bgcolor} = $toggle;
                push(@loop_data, \%row_data);
***************
*** 241,245 ****
        if ($offset+$pagesize<$count) {
                my $nextpage =$offset+$pagesize;
!               $template->param(next => "a 
href=$script_name?offset=".$nextpage.'Next &gt;&gt;</a>');
        }
  } #---- END $OP eq DEFAULT
--- 256,260 ----
        if ($offset+$pagesize<$count) {
                my $nextpage =$offset+$pagesize;
!               $template->param(next => "<a 
href=$script_name?offset=".$nextpage.'Next &gt;&gt;</a>');
        }
  } #---- END $OP eq DEFAULT