@@ -, +, @@ (2) there is a library pull-down next to 'Pickup at:', list is ordered case sensitive next to Library is a pull-down, list without order next to 'Select a library' is a pull-down, list is ordered case sensitive change last part of URL 'reports-home.pl' with 'manager.pl?report_name=issues_by_borrower_category' (can't find a direct link), next to 'Select a library' is a library pull-down, list without order there is a library pull-down, case sensitive there is library pull-down, correct order There are 3 possible situations to test: A) No branches, must show a message that are no libraries defined B) New patron, must show a correctly ordered list of branches, current branch selected C) Edit patron, must show a correctly ordered list of branches, patron branch selected --- .../value_builder/marc21_linking_section.pl | 21 +-------- cataloguing/value_builder/unimarc_field_4XX.pl | 21 +-------- .../prog/en/modules/members/memberentrygen.tt | 23 +++++++--- .../prog/en/modules/reports/issues_avg_stats.tt | 8 +++- .../modules/reports/issues_by_borrower_category.tt | 42 ++++++++++++------ .../prog/en/modules/reports/itemtypes.tt | 33 ++++++++++---- .../prog/en/modules/reserve/request.tt | 14 ++++-- .../opac-tmpl/prog/en/modules/opac-reserve.tt | 16 +++---- .../opac-tmpl/prog/en/modules/opac-suggestions.tt | 10 ++--- members/memberentry.pl | 45 +++++--------------- opac/opac-reserve.pl | 5 +-- opac/opac-suggestions.pl | 4 +- reports/issues_avg_stats.pl | 31 ++++---------- reports/issues_by_borrower_category.plugin | 42 ++++++------------ reports/itemtypes.plugin | 24 ++--------- reserve/request.pl | 21 +-------- 16 files changed, 145 insertions(+), 215 deletions(-) --- a/cataloguing/value_builder/marc21_linking_section.pl +++ a/cataloguing/value_builder/marc21_linking_section.pl @@ -348,25 +348,7 @@ sub plugin { ); $sth->finish; - my @branchloop; - my @select_branch; - my %select_branches; - my $branches = GetBranches; - push @select_branch, ""; - $select_branches{''} = ""; - foreach my $thisbranch ( keys %$branches ) { - push @select_branch, $branches->{$thisbranch}->{'branchcode'}; - $select_branches{ $branches->{$thisbranch}->{'branchcode'} } = - $branches->{$thisbranch}->{'branchname'}; - } - my $CGIbranch = CGI::scrolling_list( - -name => 'value', - -values => \@select_branch, - -labels => \%select_branches, - -size => 1, - -multiple => 0 - ); - $sth->finish; + # To show list of branches please use GetBranchesLoop() and modify template my $req = $dbh->prepare( "select distinctrow left(publishercode,45) from biblioitems order by publishercode" @@ -396,7 +378,6 @@ sub plugin { $template->param( #classlist => $classlist, CGIitemtype => $CGIitemtype, - CGIbranch => $CGIbranch, CGIPublisher => $CGIpublisher, itypeloop => \@itemtypes, index => $query->param('index'), --- a/cataloguing/value_builder/unimarc_field_4XX.pl +++ a/cataloguing/value_builder/unimarc_field_4XX.pl @@ -503,25 +503,7 @@ sub plugin { ); $sth->finish; - my @branchloop; - my @select_branch; - my %select_branches; - my $branches = GetBranches; - push @select_branch, ""; - $select_branches{''} = ""; - foreach my $thisbranch ( keys %$branches ) { - push @select_branch, $branches->{$thisbranch}->{'branchcode'}; - $select_branches{ $branches->{$thisbranch}->{'branchcode'} } = - $branches->{$thisbranch}->{'branchname'}; - } - my $CGIbranch = CGI::scrolling_list( - -name => 'value', - -values => \@select_branch, - -labels => \%select_branches, - -size => 1, - -multiple => 0 - ); - $sth->finish; + # To show list of branches please use GetBranchesLoop() and modify template my $req = $dbh->prepare( @@ -552,7 +534,6 @@ sub plugin { $template->param( #classlist => $classlist, CGIitemtype => $CGIitemtype, - CGIbranch => $CGIbranch, CGIPublisher => $CGIpublisher, itypeloop => \@itemtypes, index => $query->param('index'), --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -993,14 +993,25 @@ [% END %] [% UNLESS nobranchcode %]
  • - [% IF ( mandatorybranchcode ) %] + [%- IF ( mandatorybranchcode ) -%] + + [% IF ( mandatorybranchcode ) -%] + Required + [%- END %]
  • [% END %]
  • --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt @@ -164,7 +164,13 @@ Library - [% CGIBranch %] + +