Bug 11030 - Add 359, 947 and 969 fields in french unimarc_complete framework - followup

[koha_fer] / circ / ysearch.pl

diff --git a/circ/ysearch.pl b/circ/ysearch.pl
index 4a3663e..8973902 100755 (executable)
--- a/circ/ysearch.pl
+++ b/circ/ysearch.pl
@@ -45,19 +45,19 @@ if ($auth_status ne "ok") {
 
 my $dbh = C4::Context->dbh;
 my $sql = q(
-    SELECT surname, firstname, cardnumber, address, city, zipcode, country
+    SELECT borrowernumber, surname, firstname, cardnumber, address, city, zipcode, country
     FROM borrowers
     WHERE ( surname LIKE ?
         OR firstname LIKE ?
         OR cardnumber LIKE ? )
 );
-if (C4::Context->preference("IndependentBranches")){
-  if ( C4::Context->userenv
-      && (C4::Context->userenv->{flags} % 2) !=1
-      && C4::Context->userenv->{'branch'}
-  ){
-     $sql .= " AND borrowers.branchcode =" . $dbh->quote(C4::Context->userenv->{'branch'});
-  }
+if (   C4::Context->preference("IndependentBranches")
+    && C4::Context->userenv
+    && !C4::Context->IsSuperLibrarian()
+    && C4::Context->userenv->{'branch'} )
+{
+    $sql .= " AND borrowers.branchcode ="
+      . $dbh->quote( C4::Context->userenv->{'branch'} );
 }
 
 $sql    .= q( ORDER BY surname, firstname LIMIT 10);
@@ -68,7 +68,8 @@ print "[";
 my $i = 0;
 while ( my $rec = $sth->fetchrow_hashref ) {
     if($i > 0){ print ","; }
-    print "{\"surname\":\"" . $rec->{surname} . "\",\"" .
+    print "{\"borrowernumber\":\"" . $rec->{borrowernumber} . "\",\"" .
+          "surname\":\"".$rec->{surname} . "\",\"" .
           "firstname\":\"".$rec->{firstname} . "\",\"" .
           "cardnumber\":\"".$rec->{cardnumber} . "\",\"" .
           "address\":\"".$rec->{address} . "\",\"" .