@@ -, +, @@
---
.../prog/en/includes/circ-patron-search-results.inc | 2 +-
.../intranet-tmpl/prog/en/includes/js_includes.inc | 12 ++++++++----
.../intranet-tmpl/prog/en/modules/members/member.tt | 3 ++-
3 files changed, 11 insertions(+), 6 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc
@@ -29,7 +29,7 @@
[% INCLUDE 'patron-age.inc' patron = borrower %] |
[% Categories.GetName( borrower.categorycode ) | html %] |
- [% IF ( Branches.GetLoggedInBranchcode == borrower.branchcode ) %]
+ [% IF ( Branches.GetLoggedInBranchcode == borrower.branchcode && !singleBranchMode ) %]
[% Branches.GetName( borrower.branchcode ) | html %]
[% ELSE %]
[% Branches.GetName( borrower.branchcode ) | html %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc
@@ -105,7 +105,9 @@
+ ( item.zipcode ? item.zipcode.escapeHtml() : "" ) + " "
+ ( item.country ? item.country.escapeHtml() : "" )
+ "";
- itemString += " " + item.branchname + " " + "";
+ [% UNLESS ( singleBranchMode ) %]
+ itemString += " " + item.branchname + " " + "";
+ [% END %]
return $( "" )
.addClass( loggedInClass )
.data( "ui-autocomplete-item", item )
@@ -156,9 +158,11 @@
+ ( item.city ? item.city.escapeHtml() : "" ) + " "
+ ( item.zipcode ? item.zipcode.escapeHtml() : "" ) + " "
+ ( item.country ? item.country.escapeHtml() : "" ) + " "
- + ""
- + ( item.branchname ? item.branchname.escapeHtml() : "" )
- + ""
+ [% UNLESS ( singleBranchMode ) %]
+ + ""
+ + ( item.branchname ? item.branchname.escapeHtml() : "" )
+ + ""
+ [% END %]
+ ""
+ "" )
.appendTo( ul );
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
@@ -217,6 +217,7 @@
[% Asset.js("lib/hc-sticky.js") | $raw %]
[% Asset.js("js/members-menu.js") | $raw %]
|