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

(-)a/circ/ysearch.pl (+2 lines)
Lines 29-34 use CGI qw ( -utf8 ); Link Here
29
use C4::Context;
29
use C4::Context;
30
use C4::Auth qw/check_cookie_auth/;
30
use C4::Auth qw/check_cookie_auth/;
31
use Koha::Borrowers;
31
use Koha::Borrowers;
32
use C4::Branch;
32
33
33
use JSON qw( to_json );
34
use JSON qw( to_json );
34
35
Lines 87-92 while ( my $b = $borrowers_rs->next ) { Link Here
87
        city           => $b->city       // '',
88
        city           => $b->city       // '',
88
        zipcode        => $b->zipcode    // '',
89
        zipcode        => $b->zipcode    // '',
89
        country        => $b->country    // '',
90
        country        => $b->country    // '',
91
        branch         => C4::Branch::GetBranchName($b->branchcode) // '',
90
      };
92
      };
91
}
93
}
92
94
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (-5 / +9 lines)
Lines 173-189 h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o Link Here
173
            source: "/cgi-bin/koha/circ/ysearch.pl",
173
            source: "/cgi-bin/koha/circ/ysearch.pl",
174
            minLength: 3,
174
            minLength: 3,
175
            select: function( event, ui ) {
175
            select: function( event, ui ) {
176
                $( "#findborrowersuggestion" ).val( ui.item.surname + ', ' + ui.item.firstname + ' (' + ui.item.cardnumber + ')' );
176
                $( "#findborrowersuggestion" ).val( ui.item.surname + ', ' + ui.item.firstname + ', ' + ui.item.branch);
177
                $( "#suggestedby").val( ui.item.borrowernumber );
177
                $( "#suggestedby").val( ui.item.borrowernumber );
178
                $( "#findborrowersuggestion" ).attr('disabled', 'disabled');
178
                return false;
179
                return false;
179
            }
180
            }
180
          })
181
          })
181
          .data( "ui-autocomplete" )._renderItem = function( ul, item ) {
182
          .data( "ui-autocomplete" )._renderItem = function( ul, item ) {
182
            return $( "<li></li>" )
183
            return $( "<li></li>" )
183
            .data( "ui-autocomplete-item", item )
184
            .data( "ui-autocomplete-item", item )
184
            .append( "<a>" + item.surname + ", " + item.firstname + " (" + item.cardnumber + ") <small>" + item.address + " " + item.city + " " + item.zipcode + " " + item.country + "</small></a>" )
185
            .append( "<a>" + item.surname + ", " + item.firstname + ", " + item.branch + "</a>" )
185
            .appendTo( ul );
186
            .appendTo( ul );
186
          };
187
          };
188
          $( "#editborrowersuggestion" ).click(function() {
189
            $( "#findborrowersuggestion" ).removeAttr('disabled').focus().select();
190
          });
187
        });
191
        });
188
      // ]]>
192
      // ]]>
189
    </script>
193
    </script>
Lines 417-425 h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o Link Here
417
                <td>
421
                <td>
418
                  <div class="autocomplete">
422
                  <div class="autocomplete">
419
                  [% IF ( suggestedby_borrowernumber ) %]
423
                  [% IF ( suggestedby_borrowernumber ) %]
420
                      <input autocomplete="on" id="findborrowersuggestion" name="findborrowersuggestion" size="40" class="focus" type="text" value="[% suggestedby_surname %], [% suggestedby_firstname %] [% Branches.GetName( suggestedby_branchcode ) %] ([% suggestedby_description %])" />
424
                      <input autocomplete="on" id="findborrowersuggestion" name="findborrowersuggestion" disabled="disabled" size="60" class="focus" type="text" value="[% suggestedby_surname %], [% suggestedby_firstname %] [% Branches.GetName( suggestedby_branchcode ) %] ([% suggestedby_description %])" />
425
                      <button id="editborrowersuggestion" type="button">Edit</button>
421
                  [% ELSE %]
426
                  [% ELSE %]
422
                      <input autocomplete="on" id="findborrowersuggestion" name="findborrowersuggestion" size="40" class="focus" type="text" value="" />
427
                      <input autocomplete="on" id="findborrowersuggestion" name="findborrowersuggestion" size="60" class="focus" type="text" value="" />
423
                  [% END %]
428
                  [% END %]
424
                    <input name="branch" value="[% Branches.GetLoggedInBranchcode() %]" type="hidden" />
429
                    <input name="branch" value="[% Branches.GetLoggedInBranchcode() %]" type="hidden" />
425
                    <input name="printer" value="" type="hidden" />
430
                    <input name="printer" value="" type="hidden" />
426
- 

Return to bug 14376