View | Details | Raw Unified | Return to bug 17847
Collapse All | Expand All

(-)a/Koha/Template/Plugin/AuthorisedValues.pm (-2 / +12 lines)
Lines 40-47 sub Get { Link Here
40
}
40
}
41
41
42
sub GetAuthValueDropbox {
42
sub GetAuthValueDropbox {
43
    my ( $self, $category, $default ) = @_;
43
    my ( $self, $category ) = @_;
44
    return C4::Koha::GetAuthvalueDropbox($category, $default);
44
    my $branch_limit = C4::Context->userenv ? C4::Context->userenv->{"branch"} : "";
45
    return Koha::AuthorisedValues->search(
46
        {
47
            branchcode => $branch_limit,
48
            category => $category,
49
        },
50
        {
51
            group_by => 'lib',
52
            order_by => [ 'category', 'lib', 'lib_opac' ],
53
        }
54
    );
45
}
55
}
46
56
47
sub GetCategories {
57
sub GetCategories {
(-)a/acqui/ajax-getauthvaluedropbox.pl (-9 / +19 lines)
Lines 48-56 Default value for the dropbox. Link Here
48
use Modern::Perl;
48
use Modern::Perl;
49
49
50
use CGI qw ( -utf8 );
50
use CGI qw ( -utf8 );
51
use C4::Koha;
52
use C4::Charset;
51
use C4::Charset;
53
use C4::Auth qw/check_api_auth/;
52
use C4::Auth qw/check_api_auth/;
53
use Koha::AuthorisedValues;
54
54
55
my $query = CGI->new();
55
my $query = CGI->new();
56
binmode STDOUT, ':encoding(UTF-8)';
56
binmode STDOUT, ':encoding(UTF-8)';
Lines 67-84 my $name = $input->param('name'); Link Here
67
my $category = $input->param('category');
67
my $category = $input->param('category');
68
my $default = $input->param('default');
68
my $default = $input->param('default');
69
$default = C4::Charset::NormalizeString($default);
69
$default = C4::Charset::NormalizeString($default);
70
70
my $branch_limit = C4::Context->userenv ? C4::Context->userenv->{"branch"} : "";
71
binmode STDOUT, ':encoding(UTF-8)';
71
72
print $input->header(-type => 'text/plain', -charset => 'UTF-8');
72
my $avs = Koha::AuthorisedValues->search(
73
my $avs = C4::Koha::GetAuthvalueDropbox($category, $default);
73
    {
74
        branchcode => $branch_limit,
75
        category => $category,
76
    },
77
    {
78
        group_by => 'lib',
79
        order_by => [ 'category', 'lib', 'lib_opac' ],
80
    }
81
);
74
my $html = qq|<select id="$name" name="$name">|;
82
my $html = qq|<select id="$name" name="$name">|;
75
for my $av ( @$avs ) {
83
while ( my $av = $avs->next ) {
76
    if ( $av->{default} ) {
84
    if ( $av->authorised_value eq $default ) {
77
        $html .= qq|<option value="$av->{value}" selected="selected">$av->{label}</option>|;
85
        $html .= q|<option value="| . $av->authorised_value . q|" selected="selected">| . $av->lib . q|</option>|;
78
    } else {
86
    } else {
79
        $html .= qq|<option value="$av->{value}">$av->{label}</option>|;
87
        $html .= q|<option value="| . $av->authorised_value . q|">| . $av->lib . q|</option>|;
80
    }
88
    }
81
}
89
}
82
$html .= qq|</select>|;
90
$html .= qq|</select>|;
83
91
92
binmode STDOUT, ':encoding(UTF-8)';
93
print $input->header(-type => 'text/plain', -charset => 'UTF-8');
84
print $html;
94
print $html;
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/av-build-dropbox.inc (-4 / +4 lines)
Lines 9-15 Link Here
9
    all: add a "All" entry
9
    all: add a "All" entry
10
%]
10
%]
11
11
12
[% SET avs = AuthorisedValues.GetAuthValueDropbox( category, default ) %]
12
[% SET avs = AuthorisedValues.GetAuthValueDropbox( category ) %]
13
[% DEFAULT
13
[% DEFAULT
14
    class = ''
14
    class = ''
15
    size = 20
15
    size = 20
Lines 19-28 Link Here
19
  <select id="[% name %]" name="[% name %]" class="[% class %]" >
19
  <select id="[% name %]" name="[% name %]" class="[% class %]" >
20
  [% IF all %]<option value="">All</option>[% END %]
20
  [% IF all %]<option value="">All</option>[% END %]
21
  [% FOR av IN avs %]
21
  [% FOR av IN avs %]
22
    [% IF av.default %]
22
    [% IF av.authorised_value == default %]
23
      <option value="[% av.value %]" selected="selected">[% av.label | html_entity %]</option>
23
      <option value="[% av.authorised_value %]" selected="selected">[% av.lib | html_entity %]</option>
24
    [% ELSE %]
24
    [% ELSE %]
25
      <option value="[% av.value %]">[% av.label | html_entity %]</option>
25
      <option value="[% av.authorised_value %]">[% av.lib | html_entity %]</option>
26
    [% END %]
26
    [% END %]
27
  [% END %]
27
  [% END %]
28
  </select>
28
  </select>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt (-4 / +3 lines)
Lines 141-150 Link Here
141
                      <select id="frequency" name="frequency" class="required" required="required">
141
                      <select id="frequency" name="frequency" class="required" required="required">
142
                        <option value="">Select a frequency</option>
142
                        <option value="">Select a frequency</option>
143
                        [% FOREACH frequency IN AuthorisedValues.GetAuthValueDropbox('HSBND_FREQ') %]
143
                        [% FOREACH frequency IN AuthorisedValues.GetAuthValueDropbox('HSBND_FREQ') %]
144
                          [% IF housebound_profile.frequency == frequency.value %]
144
                          [% IF housebound_profile.frequency == frequency.authorised_value %]
145
                            <option value="[% frequency.value %]" selected="selected">[% frequency.label %]</option>
145
                            <option value="[% frequency.authorised_value %]" selected="selected">[% frequency.lib %]</option>
146
                          [% ELSE %]
146
                          [% ELSE %]
147
                            <option value="[% frequency.value %]">[% frequency.label %]</option>
147
                            <option value="[% frequency.authorised_value %]">[% frequency.lib %]</option>
148
                          [% END %]
148
                          [% END %]
149
                        [% END %]
149
                        [% END %]
150
                      </select>
150
                      </select>
151
- 

Return to bug 17847