Bug 8378 - show all items columns and new items.fine

[koha.git] / tools / holidays.pl

diff --git a/tools/holidays.pl b/tools/holidays.pl
index 93808f0..09449a3 100755 (executable)
--- a/tools/holidays.pl
+++ b/tools/holidays.pl
@@ -17,6 +17,8 @@
 
 #####Sets holiday periods for each branch. Datedues will be extended if branch is closed -TG
 use strict;
+use warnings;
+
 use CGI;
 
 use C4::Auth;
@@ -57,23 +59,26 @@ my $branch= $input->param('branch') || C4::Context->userenv->{'branch'};
 # Set all the branches.
 my $onlymine=(C4::Context->preference('IndependantBranches') &&
               C4::Context->userenv &&
-              C4::Context->userenv->{flags} !=1  &&
+              C4::Context->userenv->{flags} % 2 !=1  &&
               C4::Context->userenv->{branch}?1:0);
 if ( $onlymine ) { 
     $branch = C4::Context->userenv->{'branch'};
 }
-my $branches = GetBranches($onlymine);
+my $branchname = GetBranchName($branch);
+my $branches   = GetBranches($onlymine);
 my @branchloop;
-for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
-    my $selected = 1 if $thisbranch eq $branch;
-    my %row =(value => $thisbranch,
-                selected => $selected,
-                branchname => $branches->{$thisbranch}->{'branchname'},
-            );
-    push @branchloop, \%row;
+for my $thisbranch (
+    sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} }
+    keys %{$branches} ) {
+    push @branchloop,
+      { value      => $thisbranch,
+        selected   => $thisbranch eq $branch,
+        branchname => $branches->{$thisbranch}->{'branchname'},
+      };
 }
+
 # branches calculated - put branch codes in a single string so they can be passed in a form
-my $branchcodes = join("|", keys %$branches);
+my $branchcodes = join '|', keys %{$branches};
 
 # Get all the holidays
 
@@ -133,16 +138,19 @@ foreach my $yearMonthDay (keys %$single_holidays) {
     push @holidays, \%holiday;
 }
 
-$template->param(WEEK_DAYS_LOOP => \@week_days,
-                               branchloop => \@branchloop, 
-                               HOLIDAYS_LOOP => \@holidays,
-                               EXCEPTION_HOLIDAYS_LOOP => \@exception_holidays,
-                               DAY_MONTH_HOLIDAYS_LOOP => \@day_month_holidays,
-                               calendardate => $calendardate,
-                               keydate => $keydate,
-                               branchcodes => $branchcodes,
-                               branch => $branch
-       );
+$template->param(
+    WEEK_DAYS_LOOP           => \@week_days,
+    branchloop               => \@branchloop,
+    HOLIDAYS_LOOP            => \@holidays,
+    EXCEPTION_HOLIDAYS_LOOP  => \@exception_holidays,
+    DAY_MONTH_HOLIDAYS_LOOP  => \@day_month_holidays,
+    calendardate             => $calendardate,
+    keydate                  => $keydate,
+    branchcodes              => $branchcodes,
+    branch                   => $branch,
+    branchname               => $branchname,
+    branch                   => $branch,
+);
 
 # Shows the template with the real values replaced
 output_html_with_http_headers $input, $cookie, $template->output;