}
sub GetAuthValueDropbox {
- my ( $self, $category, $default ) = @_;
- return C4::Koha::GetAuthvalueDropbox($category, $default);
+ my ( $self, $category ) = @_;
+ my $branch_limit = C4::Context->userenv ? C4::Context->userenv->{"branch"} : "";
+ return Koha::AuthorisedValues->search(
+ {
+ branchcode => $branch_limit,
+ category => $category,
+ },
+ {
+ group_by => 'lib',
+ order_by => [ 'category', 'lib', 'lib_opac' ],
+ }
+ );
}
sub GetCategories {
use Modern::Perl;
use CGI qw ( -utf8 );
-use C4::Koha;
use C4::Charset;
use C4::Auth qw/check_api_auth/;
+use Koha::AuthorisedValues;
my $query = CGI->new();
binmode STDOUT, ':encoding(UTF-8)';
my $category = $input->param('category');
my $default = $input->param('default');
$default = C4::Charset::NormalizeString($default);
-
-binmode STDOUT, ':encoding(UTF-8)';
-print $input->header(-type => 'text/plain', -charset => 'UTF-8');
-my $avs = C4::Koha::GetAuthvalueDropbox($category, $default);
+my $branch_limit = C4::Context->userenv ? C4::Context->userenv->{"branch"} : "";
+
+my $avs = Koha::AuthorisedValues->search(
+ {
+ branchcode => $branch_limit,
+ category => $category,
+ },
+ {
+ group_by => 'lib',
+ order_by => [ 'category', 'lib', 'lib_opac' ],
+ }
+);
my $html = qq|<select id="$name" name="$name">|;
-for my $av ( @$avs ) {
- if ( $av->{default} ) {
- $html .= qq|<option value="$av->{value}" selected="selected">$av->{label}</option>|;
+while ( my $av = $avs->next ) {
+ if ( $av->authorised_value eq $default ) {
+ $html .= q|<option value="| . $av->authorised_value . q|" selected="selected">| . $av->lib . q|</option>|;
} else {
- $html .= qq|<option value="$av->{value}">$av->{label}</option>|;
+ $html .= q|<option value="| . $av->authorised_value . q|">| . $av->lib . q|</option>|;
}
}
$html .= qq|</select>|;
+binmode STDOUT, ':encoding(UTF-8)';
+print $input->header(-type => 'text/plain', -charset => 'UTF-8');
print $html;
all: add a "All" entry
%]
-[% SET avs = AuthorisedValues.GetAuthValueDropbox( category, default ) %]
+[% SET avs = AuthorisedValues.GetAuthValueDropbox( category ) %]
[% DEFAULT
class = ''
size = 20
<select id="[% name %]" name="[% name %]" class="[% class %]" >
[% IF all %]<option value="">All</option>[% END %]
[% FOR av IN avs %]
- [% IF av.default %]
- <option value="[% av.value %]" selected="selected">[% av.label | html_entity %]</option>
+ [% IF av.authorised_value == default %]
+ <option value="[% av.authorised_value %]" selected="selected">[% av.lib | html_entity %]</option>
[% ELSE %]
- <option value="[% av.value %]">[% av.label | html_entity %]</option>
+ <option value="[% av.authorised_value %]">[% av.lib | html_entity %]</option>
[% END %]
[% END %]
</select>
<select id="frequency" name="frequency" class="required" required="required">
<option value="">Select a frequency</option>
[% FOREACH frequency IN AuthorisedValues.GetAuthValueDropbox('HSBND_FREQ') %]
- [% IF housebound_profile.frequency == frequency.value %]
- <option value="[% frequency.value %]" selected="selected">[% frequency.label %]</option>
+ [% IF housebound_profile.frequency == frequency.authorised_value %]
+ <option value="[% frequency.authorised_value %]" selected="selected">[% frequency.lib %]</option>
[% ELSE %]
- <option value="[% frequency.value %]">[% frequency.label %]</option>
+ <option value="[% frequency.authorised_value %]">[% frequency.lib %]</option>
[% END %]
[% END %]
</select>