@@ -, +, @@
to BranchName
- Enable IndependentBranches and log in to Koha as a non-superlibrarian.
Try to check out an item which belongs to another library. The library
name should appear correctly in the warning message.
- In Acquisitions, view the list of basket groups for any vendor. The
"billing place" and "delivery place" columns should show library names
correctly.
- View the detail page for a subscription
(serials/subscription-detail.pl?subscriptionid=X). The library name
should appear correctly.
- In suggestions management, view the details for a suggestion
(/suggestion/suggestion.pl?suggestionid=X&op=show). Library names
should appear correctly in the "suggestions management" table and in
the "acquisition information" block.
- Test the Koha_template_plugin_BranchName.t test: In a test database
prove -v t/db_dependent/Koha_template_plugin_BranchName.t
---
.../prog/en/modules/acqui/basketgroup.tt | 10 +++++-----
.../prog/en/modules/circ/circulation.tt | 4 ++--
.../prog/en/modules/serials/subscription-detail.tt | 4 ++--
.../prog/en/modules/suggestion/suggestion.tt | 16 ++++++++--------
...nchName.t => Koha_template_plugin_BranchName.t} | 6 +++---
5 files changed, 20 insertions(+), 20 deletions(-)
rename t/db_dependent/{Koha_template_plugin_KohaBranchName.t => Koha_template_plugin_BranchName.t} (86%)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
@@ -1,4 +1,4 @@
-[% USE KohaBranchName %]
+[% USE BranchName %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Basket grouping for [% booksellername |html %]
@@ -275,8 +275,8 @@ function submitForm(form) {
[% END %]
[% basketgroup.id %]
-
[% basketgroup.billingplace | $KohaBranchName %]
-
[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% basketgroup.deliveryplace | $KohaBranchName %][% END %]
+
[% basketgroup.billingplace | $BranchName %]
+
[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% basketgroup.deliveryplace | $BranchName %][% END %]
[% basketgroup.basketsqty %]
@@ -313,8 +313,8 @@ function submitForm(form) {
[% END %]
[% basketgroup.id %]
-
[% basketgroup.billingplace | $KohaBranchName %]
-
[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% basketgroup.deliveryplace | $KohaBranchName %][% END %]
+
[% basketgroup.billingplace | $BranchName %]
+
[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% basketgroup.deliveryplace | $BranchName %][% END %]
[% basketgroup.basketsqty %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -1,4 +1,4 @@
-[% USE KohaBranchName %]
+[% USE BranchName %]
[% USE KohaDates %]
[% IF ( export_remove_fields OR export_with_csv_profile ) %]
[% SET exports_enabled = 1 %]
@@ -547,7 +547,7 @@ function validate1(date) {
[% END %]
[% IF ( ITEMNOTSAMEBRANCH ) %]
-
This item belongs to [% itemhomebranch | $KohaBranchName %] and cannot be checked out from this location.
+
This item belongs to [% itemhomebranch | $BranchName %] and cannot be checked out from this location.
[% END %]
[% IF ( USERBLOCKEDREMAINING ) %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -1,4 +1,4 @@
-[% USE KohaBranchName %]
+[% USE BranchName %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Serials › Details for subscription #[% subscriptionid %]
[% INCLUDE 'doc-head-close.inc' %]
@@ -102,7 +102,7 @@ $(document).ready(function() {