[Koha-cvs] koha/barcodes label-templates.pl [dev_week]

[Mason James]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Mason James <sushi>	07/07/10 12:12:28

Modified files:
	barcodes       : label-templates.pl 

Log message:
	moving 'get-active' lookup til after active template is set, not before

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/barcodes/label-templates.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.5&r2=1.1.2.6

Patches:
Index: label-templates.pl
===================================================================
RCS file: /sources/koha/koha/barcodes/Attic/label-templates.pl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -b -r1.1.2.5 -r1.1.2.6
--- label-templates.pl	10 Jul 2007 05:47:06 -0000	1.1.2.5
+++ label-templates.pl	10 Jul 2007 12:12:28 -0000	1.1.2.6
@@ -40,18 +40,6 @@
 );
 
 
-# little block for displaying active layout/template/batch in templates
-# ----------
-my $batch_id     = $query->param('batch_id');
-my $active_layout = get_active_layout();
-my $active_template = GetActiveLabelTemplate();
-my $active_layout_name = $active_layout->{'layoutname'};
-my $active_template_name = $active_template->{'tmpl_code'};
-# ----------
-
-
-
-
 my @resultsloop;
 
 
@@ -69,6 +57,15 @@
 
     @resultsloop = GetAllLabelTemplates();
 
+# little block for displaying active layout/template/batch in templates
+# ----------
+my $batch_id     = $query->param('batch_id');
+my $active_layout = get_active_layout();
+my $active_template = GetActiveLabelTemplate();
+my $active_layout_name = $active_layout->{'layoutname'};
+my $active_template_name = $active_template->{'tmpl_code'};
+# ----------
+
 $template->param(
 
     batch_id => $batch_id,