Small template cleanup: display library name and cat description instead of codes

[koha_gimpoz] / tools / holidays.pl

diff --git a/tools/holidays.pl b/tools/holidays.pl
index 9f81511..c87964a 100755 (executable)
--- a/tools/holidays.pl
+++ b/tools/holidays.pl
@@ -38,7 +38,7 @@ my ($template, $loggedinuser, $cookie)
                              type => "intranet",
                              query => $input,
                              authnotrequired => 0,
-                             flagsrequired => {tools => 1},
+                             flagsrequired => {tools => 'edit_calendar'},
                              debug => 1,
                            });
 
@@ -60,8 +60,7 @@ my $branchesList = CGI::scrolling_list(-name => 'branch',
                                        -size => 1,
                                        -default => [$branch],
                                        -multiple => 0,
-                                       -id => "branch",
-                                       -onChange => "changeBranch()");
+                                       -id => "branch");
 
 $branches->finish;
 
@@ -114,8 +113,9 @@ foreach my $yearMonthDay (keys %$single_holidays) {
 
 # Replace the template values with the real ones
 # If we have independent branches on we need to only let the user set holidays for their branch
-if ( C4::Context->preference("IndependantBranches") ) { 
-       $template->param(BRANCHES => C4::Context->userenv->{'branchname'});             
+# (except if the user is superlibrarian, in which case he can choose the branch anyway)
+if ( C4::Context->preference("IndependantBranches") && !(C4::Context->userenv->{'flags'} % 2) ) { 
+       $template->param(BRANCHES => C4::Context->userenv->{'branchname'}."<input type='hidden' id='branch' value='".C4::Context->userenv->{'branch'}."'>");
 }
 else {
        $template->param(BRANCHES => $branchesList);