From 05b4fd7d522436face13f45634671bae0151b013 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Mon, 9 Jun 2014 17:35:43 +0200
Subject: [PATCH] Bug 9811: Various fixes

This patch fixes the issues raised in bug 9811 comment 105, 106 and 107:
1/ Add missing space between category and type.
2/ Fix error on searching an empty string (caused by a previous rebase).
3/ Remove sort option on checkbox/borrowernumber column.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt       | 2 +-
 .../prog/en/modules/members/tables/members_results.tt           | 2 +-
 members/member.pl                                               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
index 0d814485a3..97e27b2534 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
@@ -185,7 +185,7 @@ $(document).ready(function() {
         },
         'aoColumns':[
             [% IF CAN_user_tools_manage_patron_lists %]
-              { 'mDataProp': 'dt_borrowernumber' },
+              { 'mDataProp': 'dt_borrowernumber', 'bSortable': false },
             [% END %]
             { 'mDataProp': 'dt_cardnumber' },
             { 'mDataProp': 'dt_name' },
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt
index 5f37d15946..aab99401f3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt
@@ -14,7 +14,7 @@
                 "dt_name":
                     "<span style='white-space:nowrap'><a href='/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber %]'>[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames cardnumber = data.cardnumber invert_name = 1%]</a><br />[% IF ( data.streetnumber ) %][% data.streetnumber %] [% END %][% data.address %][% IF ( data.address2 ) %]<br />[% data.address2 %][% END %][% IF ( data.city ) %]<br />[% data.city %][% IF ( data.state ) %],[% END %][% END %][% IF ( data.state ) %] [% data.state %][% END %] [% IF ( data.zipcode ) %]  [% data.zipcode %][% END %][% IF ( data.country ) %], [% data.country %][% END %][% IF data.email %]<br/>Email&#58; <a href='mailto&#58;[% data.email %]'>[% data.email %]</a>[% END %]</span>",
                 "dt_category":
-                    "[% data.category_description |html %]([% data.category_type |html %])",
+                    "[% data.category_description |html %] ([% data.category_type |html %])",
                 "dt_branch":
                     "[% data.branchname |html %]",
                 "dt_dateexpiry":
diff --git a/members/member.pl b/members/member.pl
index cd80577b86..ad3ee854ad 100755
--- a/members/member.pl
+++ b/members/member.pl
@@ -53,7 +53,7 @@ foreach (keys %$patron){
 my $searchmember = $input->param('searchmember');
 my $quicksearch = $input->param('quicksearch') // 0;
 
-if ( $quicksearch ) {
+if ( $quicksearch and $searchmember ) {
     my $branchcode;
     if ( C4::Branch::onlymine ) {
         my $userenv = C4::Context->userenv;
-- 
2.39.5