View | Details | Raw Unified | Return to bug 10902
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc (-1 / +1 lines)
Lines 29-35 Link Here
29 
                <td data-order="[% borrower.dateofbirth | html %]">[% INCLUDE 'patron-age.inc' patron = borrower %]</td>
 29 
                <td data-order="[% borrower.dateofbirth | html %]">[% INCLUDE 'patron-age.inc' patron = borrower %]</td>
30 
                <td>[% Categories.GetName( borrower.categorycode ) | html %]</td>
 30 
                <td>[% Categories.GetName( borrower.categorycode ) | html %]</td>
31 
                <td>
 31 
                <td>
32 
                    [% IF ( Branches.GetLoggedInBranchcode == borrower.branchcode ) %]
 32 
                    [% IF ( Branches.GetLoggedInBranchcode == borrower.branchcode && !singleBranchMode ) %]
33 
                        <span class="currentlibrary">[% Branches.GetName( borrower.branchcode ) | html %]</span>
 33 
                        <span class="currentlibrary">[% Branches.GetName( borrower.branchcode ) | html %]</span>
34 
                    [% ELSE %]
 34 
                    [% ELSE %]
35 
                        [% Branches.GetName( borrower.branchcode ) | html %]
 35 
                        [% Branches.GetName( borrower.branchcode ) | html %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc (-4 / +8 lines)
Lines 105-111 Link Here
105 
                                    + ( item.zipcode ? item.zipcode.escapeHtml() : "" ) + " "
 105 
                                    + ( item.zipcode ? item.zipcode.escapeHtml() : "" ) + " "
106 
                                    + ( item.country ? item.country.escapeHtml() : "" )
 106 
                                    + ( item.country ? item.country.escapeHtml() : "" )
107 
                                    + "</small></a>";
 107 
                                    + "</small></a>";
108 
                        itemString += " <span class=\"ac-library\">" + item.branchname + "</span> " + "</a>";
 108 
                        [% UNLESS ( singleBranchMode ) %]
109 
                            itemString += " <span class=\"ac-library\">" + item.branchname + "</span> " + "</a>";
110 
                        [% END %]
109 
                        return $( "<li></li>" )
 111 
                        return $( "<li></li>" )
110 
                        .addClass( loggedInClass )
 112 
                        .addClass( loggedInClass )
111 
                        .data( "ui-autocomplete-item", item )
 113 
                        .data( "ui-autocomplete-item", item )
Lines 156-164 Link Here
156 
                            + ( item.city        ? item.city.escapeHtml() : "" )        + " "
 158 
                            + ( item.city        ? item.city.escapeHtml() : "" )        + " "
157 
                            + ( item.zipcode     ? item.zipcode.escapeHtml() : "" )     + " "
 159 
                            + ( item.zipcode     ? item.zipcode.escapeHtml() : "" )     + " "
158 
                            + ( item.country     ? item.country.escapeHtml() : "" ) + " "
 160 
                            + ( item.country     ? item.country.escapeHtml() : "" ) + " "
159 
                            + "<span class=\"ac-library\">"
 161 
                            [% UNLESS ( singleBranchMode ) %]
160 
                            + ( item.branchname  ? item.branchname.escapeHtml() : "" )
 162 
                                + "<span class=\"ac-library\">"
161 
                            + "</span>"
 163 
                                + ( item.branchname  ? item.branchname.escapeHtml() : "" )
164 
                                + "</span>"
165 
                            [% END %]
162 
                        + "</small>"
 166 
                        + "</small>"
163 
                    + "</a>" )
 167 
                    + "</a>" )
164 
                .appendTo( ul );
 168 
                .appendTo( ul );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt (-2 / +2 lines)
Lines 217-222 Link Here
217 
    [% Asset.js("lib/hc-sticky.js") | $raw %]
 217 
    [% Asset.js("lib/hc-sticky.js") | $raw %]
218 
    [% Asset.js("js/members-menu.js") | $raw %]
 218 
    [% Asset.js("js/members-menu.js") | $raw %]
219 
    <script>
 219 
    <script>
220 
        var singleBranchMode = '[% singleBranchMode | html %]';
220 
        $(document).ready(function() {
 221 
        $(document).ready(function() {
221 
            $('#merge-patrons').prop('disabled', true);
 222 
            $('#merge-patrons').prop('disabled', true);
222 
            $('#memberresultst').on('change', 'input.selection', function() {
 223 
            $('#memberresultst').on('change', 'input.selection', function() {
Lines 467-473 Link Here
467 
                    { 'mDataProp': 'dt_category' },
 468 
                    { 'mDataProp': 'dt_category' },
468 
                    {
 469 
                    {
469 
                        'mDataProp': function ( oObj ) {
 470 
                        'mDataProp': function ( oObj ) {
470 
                            if( oObj.dt_branch == "[% Branches.GetLoggedInBranchname | html %]" ){
 471 
                            if( !singleBranchMode &&  oObj.dt_branch == "[% Branches.GetLoggedInBranchname | html %]" ){
471 
                                return "<span class=\"currentlibrary\">" + oObj.dt_branch + "</span>";
 472 
                                return "<span class=\"currentlibrary\">" + oObj.dt_branch + "</span>";
472 
                            } else {
 473 
                            } else {
473 
                                return oObj.dt_branch;
 474 
                                return oObj.dt_branch;
474 
-

Return to bug 10902