[Koha-cvs] koha/holidays holidays.pl [dev_week]

[Ryan Higgins]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Ryan Higgins <rych>     07/01/23 09:49:46

Modified files:
        holidays       : holidays.pl 

Log message:
        holidays.pl

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/holidays/holidays.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.2

Patches:
Index: holidays.pl
===================================================================
RCS file: /sources/koha/koha/holidays/Attic/holidays.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- holidays.pl 12 Jul 2006 11:20:39 -0000      1.1.2.1
+++ holidays.pl 23 Jan 2007 09:49:46 -0000      1.1.2.2
@@ -11,8 +11,8 @@
 use C4::Calendar::Calendar;
 
 my $input = new CGI;
-#my $branch = $input->param('branch');
-my $branch=C4::Context->preference('defaultbranch');;
+
+my $branch= $input->param('branch') || 
C4::Context->preference('defaultbranch') || 'MAIN'; 
 my $dbh = C4::Context->dbh();
 
 # Set all the branches.
@@ -82,7 +82,7 @@
 
 # Get the template to use
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => 
"parameters/holidays/holidays.tmpl",
+    = get_template_and_user({template_name => 
"parameters/holidays/holidays.rel3.tmpl",
                                         type => "intranet",
                                         query => $input,
                                         authnotrequired => 0,
@@ -91,6 +91,7 @@
                                       });
 
 # Replace the template values with the real ones
+
 $template->param(BRANCHES => $branchesList);
 $template->param(WEEK_DAYS_LOOP => address@hidden);
 $template->param(HOLIDAYS_LOOP => address@hidden);