[Koha-cvs] koha/barcodes label-manager.pl label-item-searc... [rel_2_2]

[Ryan Higgins]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     Ryan Higgins <rych>     07/07/12 07:38:11

Modified files:
        barcodes       : label-manager.pl label-item-search.pl 

Log message:
        barcods/label-save-template.pl

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-manager.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-item-search.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.3&r2=1.1.2.4

Patches:
Index: label-manager.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/label-manager.pl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- label-manager.pl    10 Jul 2007 10:54:04 -0000      1.1.2.4
+++ label-manager.pl    12 Jul 2007 07:38:11 -0000      1.1.2.5
@@ -29,7 +29,7 @@
 my $itemtype       = $query->param('tx_itemtype');
 my $dcn            = $query->param('tx_dewey');
 my $classif        = $query->param('tx_classif');
-my $itemcallnumber = $query->param('itemcallnumber');
+my $itemcallnumber = $query->param('tx_itemcallnumber');
 my $subclass       = $query->param('tx_subclass');
 my $author         = $query->param('tx_author');
 my $tmpl_id        = $query->param('tmpl_id');
@@ -50,12 +50,11 @@
 my $active_template_name = $active_template->{'tmpl_code'};
 # ----------
 
-if (!$batch_id ) {
-    $batch_id  = get_highest_batch();
-}
+#if (!$batch_id ) {
+#    $batch_id  = get_highest_batch();
+#}
 
 my ($itemnumber) = @itemnumber if (scalar(@itemnumber) == 1);
-### $batch_id;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
@@ -69,6 +68,7 @@
 );
 
 if ( $op eq 'save_conf' ) {    # this early sub is depreciated, use 
save_layout()
+   
     SaveConf(
         $barcodetype,    $title,  $isbn, 
         $issn,    $itemtype,         $bcn,            $dcn, 
@@ -123,6 +123,8 @@
 
 elsif ( $op eq 'delete_batch' ) {
     delete_batch($batch_id);
+     print $query->redirect("label-manager.pl?batch_id=");
+        exit;
 }
 
 elsif ( $op eq 'add_batch' ) {
@@ -144,7 +146,6 @@
 my @resultsloop = get_label_items($batch_id);
 my $tmpl =GetActiveLabelTemplate();
 ### $tmpl
-
 #calc-ing number of sheets
 #my $number_of_results = scalar @resultsloop;
 #my $sheets_needed = ( ( --$number_of_results + $startrow ) / 8 );
@@ -156,13 +157,13 @@
 
 $template->param(
     batch_id => $batch_id,
+       batch_count => scalar @resultsloop,
     active_layout_name => $active_layout_name,
     active_template_name => $active_template_name,
 
     resultsloop => address@hidden,
     batches => address@hidden,
-batch_id => $batch_id,
-tmpl_desc => $tmpl->{'tmpl_desc'},
+       tmpl_desc => $tmpl->{'tmpl_desc'},
 
     #  startrow         => $startrow,
     #  sheets           => $sheets_needed,

Index: label-item-search.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/label-item-search.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4