Bug 10676: Fix behaviour of OpacHiddenItems for items.restricted
The numerical restricted value was overwritten in GetItemsInfo
with the description. So OpacHiddenItems would only work for
restricted using the description, not the numerical value
of the authorised value like for other similar status fields.
This changes GetItemsInfo to use a separate variable for
the description, as it's already done for notforloan and
changes the template files where the variable is used
accordingly.
To test
- Before applying patch
- Configure OpacHiddenItems with:
restricted: [1]
- Find a record with more than one item and mark one of the items
as "Restricted Access"
(assume standard sample data - check authorised value if status doesn't exist)
- Verify the item is still shown in OPAC.
- Apply patch
- Verify that the item is now hidden
- Verify that the status still displays nicely in the staff detail page
- Delete OpacHiddenItems
- Verify that the status is showing nicely in the OPAC detail page
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 39d2885d13)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
parent
02179a9f05
commit
ceb74447df
|
|
@ -1050,8 +1050,8 @@ sub GetItemsInfo {
|
|||
|
||||
# get restricted status and description if applicable
|
||||
$descriptions = Koha::AuthorisedValues->get_description_by_koha_field({frameworkcode => $data->{frameworkcode}, kohafield => 'items.restricted', authorised_value => $data->{restricted} });
|
||||
$data->{restricted} = $descriptions->{lib} // '';
|
||||
$data->{restrictedopac} = $descriptions->{opac_description} // '';
|
||||
$data->{restrictedvalue} = $descriptions->{lib} // '';
|
||||
$data->{restrictedvalueopac} = $descriptions->{opac_description} // '';
|
||||
|
||||
# my stack procedures
|
||||
$descriptions = Koha::AuthorisedValues->get_description_by_koha_field({frameworkcode => $data->{frameworkcode}, kohafield => 'items.stack', authorised_value => $data->{stack} });
|
||||
|
|
|
|||
|
|
@ -497,7 +497,7 @@
|
|||
[% END %]
|
||||
|
||||
[% IF ( item.restricted ) %]
|
||||
<span class="restricted">([% item.restricted | html %])</span>
|
||||
<span class="restricted">([% item.restrictedvalue | html %])</span>
|
||||
[% END %]
|
||||
|
||||
</td>
|
||||
|
|
|
|||
|
|
@ -65,13 +65,13 @@
|
|||
[% IF NOT ( item.isa('Koha::Item') ) AND item.itemnotforloan %]
|
||||
[% SET itemavailable = 0 %]
|
||||
[% IF ( item.notforloanvalueopac ) %]
|
||||
<span class="item-status notforloan">[% item.notforloanvalueopac | html %] [% IF ( item.restrictedopac ) %]<span class="restricted">([% item.restrictedopac | html %])</span>[% END %]</span>
|
||||
<span class="item-status notforloan">[% item.notforloanvalueopac | html %] [% IF ( item.restrictedvalueopac ) %]<span class="restricted">([% item.restrictedvalueopac | html %])</span>[% END %]</span>
|
||||
[% ELSE %]
|
||||
<span class="item-status notforloan">Not for loan [% IF ( item.restrictedopac ) %]<span class="restricted">([% item.restrictedopac | html %])</span>[% END %]</span>
|
||||
<span class="item-status notforloan">Not for loan [% IF ( item.restrictedvalueopac ) %]<span class="restricted">([% item.restrictedvalueopac | html %])</span>[% END %]</span>
|
||||
[% END %]
|
||||
[% ELSIF NOT ( item.isa('Koha::Item') ) AND item.notforloan_per_itemtype %]
|
||||
[% SET itemavailable = 0 %]
|
||||
<span class="item-status notforloan">Not for loan [% IF ( item.restrictedopac ) %]<span class="restricted">([% item.restrictedopac | html %])</span>[% END %]</span>
|
||||
<span class="item-status notforloan">Not for loan [% IF ( item.restrictedvalueopac ) %]<span class="restricted">([% item.restrictedvalueopac | html %])</span>[% END %]</span>
|
||||
[% END %]
|
||||
|
||||
[% IF ( item.damaged ) %]
|
||||
|
|
@ -90,6 +90,6 @@
|
|||
[% END %]
|
||||
|
||||
[% IF ( itemavailable ) %]
|
||||
[% IF NOT item.isa('Koha::Item') %][% SET restrictedopac = item.restrictedopac %][% END %]
|
||||
<span class="item-status available">Available [% IF restrictedopac %]<span class="restricted">([% restrictedopac | html %])</span>[% END %]</span>
|
||||
[% IF NOT item.isa('Koha::Item') %][% SET restrictedvalueopac = item.restrictedvalueopac %][% END %]
|
||||
<span class="item-status available">Available [% IF restrictedvalueopac %]<span class="restricted">([% restrictedvalueopac | html %])</span>[% END %]</span>
|
||||
[% END %]
|
||||
|
|
|
|||
Loading…
Reference in New Issue