From 038405724a153ead16699f2078073027d364798a Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Fri, 20 Dec 2013 04:22:20 +0000 Subject: [PATCH] Bug 10626: (follow-up) replace use of KohaAuthorisedValues in the Bootstrap theme Signed-off-by: Galen Charlton (cherry picked from commit e334aed702634b8c73aa28c467b585202c7ab117) Signed-off-by: Fridolin SOMERS Conflicts: koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc --- .../bootstrap/en/includes/item-status-schema-org.inc | 2 -- koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc | 6 +++--- .../opac-tmpl/bootstrap/en/modules/opac-suggestions.tt | 2 +- koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status-schema-org.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status-schema-org.inc index 0c6450364c..cd01e72fb6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status-schema-org.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status-schema-org.inc @@ -1,5 +1,3 @@ -[% USE KohaAuthorisedValues %] - [% IF ( item.damaged or item.datedue or item.itemlost or item.transfertwhen or item.waiting ) %] [% ELSIF ( item.withdrawn ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc index 60fbe64f0b..e884083b4c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc @@ -1,4 +1,4 @@ -[% USE KohaAuthorisedValues %] +[% USE AuthorisedValues %] [% IF ( item.datedue ) %] [% IF ( OPACShowCheckoutName ) %] @@ -14,7 +14,7 @@ [% ELSIF ( item.withdrawn ) %] Item withdrawn [% ELSIF ( item.itemlost ) %] - [% av_lib_include = KohaAuthorisedValues.GetByCode( 'LOST', item.itemlost, 1 ) %] + [% av_lib_include = AuthorisedValues.GetByCode( 'LOST', item.itemlost, 1 ) %] [% IF ( av_lib_include ) %] [% av_lib_include %] [% ELSE %] @@ -33,7 +33,7 @@ [% ELSIF ( item.notforloan_per_itemtype ) %] Not for loan [% IF ( item.restrictedopac ) %]([% item.restrictedopac %])[% END %] [% ELSIF ( item.damaged ) %] - [% av_lib_include = KohaAuthorisedValues.GetByCode( 'DAMAGED', item.damaged, 1 ) %] + [% av_lib_include = AuthorisedValues.GetByCode( 'DAMAGED', item.damaged, 1 ) %] [% IF av_lib_include %] [% av_lib_include %] [% ELSE %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt index bb7c1eabf0..0ba041213e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt @@ -202,7 +202,7 @@ [% ELSIF ( suggestions_loo.ORDERED ) %]Ordered by the library [% ELSIF ( suggestions_loo.REJECTED ) %]Suggestion declined [% ELSIF ( suggestions_loo.AVAILABLE ) %]Available in the library - [% ELSE %] [% KohaAuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS, 1 ) %] [% END %] + [% ELSE %] [% AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestions_loo.STATUS, 1 ) %] [% END %] [% END # / FOREACH suggestions_loo %] diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc b/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc index 172a55a887..bde2e2c03a 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc @@ -1,7 +1,7 @@ [% USE AuthorisedValues %] [% IF ( item.itemlost ) %] - [% av_lib_include = KohaAuthorisedValues.GetByCode( 'LOST', item.itemlost, 1 ) %] + [% av_lib_include = AuthorisedValues.GetByCode( 'LOST', item.itemlost, 1 ) %] [% IF ( av_lib_include ) %] [% av_lib_include %] [% ELSE %] -- 2.39.5