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

(-)a/Koha/Template/Plugin/Branches.pm (-12 / +9 lines)
Lines 111-143 sub pickup_locations { Link Here
111
    my $selected      = $params->{selected};
111
    my $selected      = $params->{selected};
112
    my @libraries;
112
    my @libraries;
113
113
114
    if(defined $search_params->{item} || defined $search_params->{biblio}) {
114
    if ( defined $search_params->{item} || defined $search_params->{biblio} ) {
115
        my $item = $search_params->{'item'};
115
        my $item   = $search_params->{'item'};
116
        my $biblio = $search_params->{'biblio'};
116
        my $biblio = $search_params->{'biblio'};
117
        my $patron = $search_params->{'patron'};
117
        my $patron = $search_params->{'patron'};
118
118
119
        unless (! defined $patron || ref($patron) eq 'Koha::Patron') {
119
        unless ( !defined $patron || ref($patron) eq 'Koha::Patron' ) {
120
            $patron = Koha::Patrons->find($patron);
120
            $patron = Koha::Patrons->find($patron);
121
        }
121
        }
122
122
123
        if ($item) {
123
        if ($item) {
124
            $item = Koha::Items->find($item)
124
            $item = Koha::Items->find($item)
125
              unless ref($item) eq 'Koha::Item';
125
              unless ref($item) eq 'Koha::Item';
126
            @libraries = $item->pickup_locations( { patron => $patron } )
126
            @libraries = $item->pickup_locations( { patron => $patron } )->as_list
127
              if defined $item;
127
              if defined $item;
128
        }
128
        } elsif ($biblio) {
129
        elsif ($biblio) {
130
            $biblio = Koha::Biblios->find($biblio)
129
            $biblio = Koha::Biblios->find($biblio)
131
              unless ref($biblio) eq 'Koha::Biblio';
130
              unless ref($biblio) eq 'Koha::Biblio';
132
            @libraries = $biblio->pickup_locations( { patron => $patron } )
131
            @libraries = $biblio->pickup_locations( { patron => $patron } )->as_list
133
              if defined $biblio;
132
              if defined $biblio;
134
        }
133
        }
134
    } else {
135
        @libraries = Koha::Libraries->search( { pickup_location => 1 }, { order_by => ['branchname'] } )
136
          unless @libraries;
135
    }
137
    }
136
138
137
    @libraries = Koha::Libraries->search( { pickup_location => 1 },
138
        { order_by => ['branchname'] } )
139
      unless @libraries;
140
141
    @libraries = map { $_->unblessed } @libraries;
139
    @libraries = map { $_->unblessed } @libraries;
142
140
143
    for my $l (@libraries) {
141
    for my $l (@libraries) {
144
- 

Return to bug 29807