gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sort dropdowns for libraries by name instead of branchcode in several staff-side interfaces. 

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
This commit is contained in:
Ryan Higgins 2008-06-01 09:56:49 -05:00 committed by Joshua Ferraro
parent a5eb233c0c
commit fc98d228c2
8 changed files with 41 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/issuingrules.pl
View File

@ -76,7 +76,7 @@ if ($op eq 'save') {
}
my $branches = GetBranches;
my @branchloop;
foreach my $thisbranch (keys %$branches) {
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,

2
admin/smart-rules.pl
View File

@ -78,7 +78,7 @@ elsif ($op eq 'add') {
}
my $branches = GetBranches();
my @branchloop;
foreach my $thisbranch (keys %$branches) {
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,

2
catalogue/search.pl
View File

@ -208,7 +208,7 @@ if (C4::Context->preference("marcflavour") eq "UNIMARC" ) {
my $branches = GetBranches();
my @branch_loop;
for my $branch_hash (sort keys %$branches) {
for my $branch_hash (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
push @branch_loop, {value => "$branch_hash" , branchname => $branches->{$branch_hash}->{'branchname'}, };
}

2
circ/selectbranchprinter.pl
View File

@ -67,7 +67,7 @@ my $oldprinter = $printer;
my $branchcount = 0;
my $printercount = 0;
my @branchloop;
foreach my $br ( sort keys %$branches ) {
for my $br (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
next unless $br =~ /\S/; # next unless $br is not blank.
$branchcount++;

12
koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl
View File

@ -153,7 +153,17 @@ h1 select { width: 20em; }
<!-- ****** END OF INFORMATION PANEL ****** -->
<!-- ************************************************************************************** -->
<h1>Define the holidays for branch <!-- TMPL_VAR name="BRANCHES" --></h1>
<h1>Define the holidays for :</h1>
<label for="branch">Select a library :</label>
<select id="branch" name="branch">
<!-- TMPL_LOOP NAME="branchloop" -->
<!-- TMPL_IF NAME="selected" -->
<option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
<!-- TMPL_ELSE -->
<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
</select>
<ul>
<li>Search in the calendar the day you want to set as holiday.</li>
<li>Complete the information in the right area.</li>

2
members/memberentry.pl
View File

@ -455,7 +455,7 @@ my $onlymine=(C4::Context->preference('IndependantBranches') &&
my $branches=GetBranches($onlymine);
my $default;
foreach my $branch (sort keys %$branches) {
for my $branch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
push @select_branch,$branch;
$select_branches{$branch} = $branches->{$branch}->{'branchname'};
$default = C4::Context->userenv->{'branch'} if (C4::Context->userenv && C4::Context->userenv->{'branch'});

2
serials/subscription-add.pl
View File

@ -99,7 +99,7 @@ my $onlymine=C4::Context->preference('IndependantBranches') &&
C4::Context->userenv->{branch};
my $branches = GetBranches($onlymine);
my @branchloop;
foreach my $thisbranch (keys %$branches) {
for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
my $selected = 1 if $thisbranch eq C4::Context->userenv->{'branch'};
my %row =(value => $thisbranch,
selected => $selected,

60
tools/holidays.pl
View File

@ -22,7 +22,7 @@ use CGI;
use C4::Auth;
use C4::Output;
use C4::Branch; # GetBranches
use C4::Calendar;
my $input = new CGI;
@ -43,30 +43,25 @@ my ($template, $loggedinuser, $cookie)
});
# Set all the branches.
my $branches = $dbh->prepare("select branchcode, branchname from branches");
$branches->execute;
# It creates a list of branches
my %list;
while (my ($branchcode, $branchname) = $branches->fetchrow) {
$list{$branchcode} = $branchname;
}
my @listValues = keys(%list);
if (!defined($branch)) {
$branch =$listValues[4];
}
my $branchesList = CGI::scrolling_list(-name => 'branch',
-values => \@listValues,
-labels => \%list,
-size => 1,
-default => [$branch],
-multiple => 0,
-id => "branch");
$branches->finish;
my $onlymine=(C4::Context->preference('IndependantBranches') &&
C4::Context->userenv &&
C4::Context->userenv->{flags} !=1 &&
C4::Context->userenv->{branch}?1:0);
if ( C4::Context->preference("IndependantBranches") ) {
$branch = C4::Context->userenv->{'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;
}
# Get all the holidays
my $calendar = C4::Calendar->new(branchcode => $branch);
@ -111,20 +106,13 @@ foreach my $yearMonthDay (keys %$single_holidays) {
push @holidays, \%holiday;
}
# 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
# (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);
}
$template->param(WEEK_DAYS_LOOP => \@week_days);
$template->param(HOLIDAYS_LOOP => \@holidays);
$template->param(EXCEPTION_HOLIDAYS_LOOP => \@exception_holidays);
$template->param(DAY_MONTH_HOLIDAYS_LOOP => \@day_month_holidays);
$template->param(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,
branch => $branch
);
# Shows the template with the real values replaced
output_html_with_http_headers $input, $cookie, $template->output;