Bug 10626: (follow-up) replace use of KohaAuthorisedValues in the Bootstrap theme

Signed-off-by: Galen Charlton <gmc@esilibrary.com>

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 0c64503..cd01e72 100644 (file)
--- 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 ) %]
     <link property="availability" href="http://schema.org/OutOfStock" />
 [% 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 4b77040..f14df90 100644 (file)
--- 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 %]
 
 [%#-
 This include takes two parameters: an item structure
@@ -8,7 +8,7 @@ not use an API to fetch items that populates item.datedue.
 -%]
 
 [% 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 %]
@@ -40,7 +40,7 @@ not use an API to fetch items that populates item.datedue.
 [% ELSIF ( item.notforloan_per_itemtype ) %]
     Not for loan [% IF ( item.restrictedopac ) %]<span class="restricted">([% item.restrictedopac %])</span>[% 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 bb7c1ea..0ba0412 100644 (file)
--- 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 %]
                                                     </td>
                                                 </tr>
                                             [% 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 ec7304d..21bde2c 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/item-status.inc
@@ -8,7 +8,7 @@ not use an API to fetch items that populates item.datedue.
 -%]
 
 [% 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 %]