Bug 5003: Can not search for organisation by name

Rebased to current HEAD, small error fixed.
Should also apply to 3.2

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl
index 7fa5099..13fb052 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl
@@ -48,6 +48,7 @@
 <h3>Search for guarantor</h3>
        <form action="/cgi-bin/koha/members/guarantor_search.pl" method="post">
                <fieldset>
+               <input type="hidden" name="category_type" id="category_type" value="<!-- TMPL_VAR NAME="category_type" -->" />
                <input type="text" name="member" id="member" value="<!-- TMPL_VAR NAME="member" -->" class="focus" /> Ordered by
                <select name="orderby">
                        <option value="surname,firstname">Surname</option>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index bf5ea1a..5fa4f82 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -350,9 +350,9 @@
         <li>
             <span class="label">&nbsp;</span>
             <!-- TMPL_IF NAME="guarantorid" -->
-            <input id="guarantorsearch" type="button" value="Change" onclick="Dopopguarantor('guarantor_search.pl');" />
+            <input id="guarantorsearch" type="button" value="Change" onclick="Dopopguarantor('guarantor_search.pl?category_type=<!-- TMPL_VAR NAME="category_type" -->');" />
             <!-- TMPL_ELSE -->
-            <input id="guarantorsearch" type="button" value="Set to Patron" onclick="Dopopguarantor('guarantor_search.pl');" />
+            <input id="guarantorsearch" type="button" value="Set to Patron" onclick="Dopopguarantor('guarantor_search.pl?category_type=<!-- TMPL_VAR NAME="category_type" -->');" />
             <!-- /TMPL_IF -->
             <input id="guarantordelete" type="button" value="Delete" />
         </li>

diff --git a/members/guarantor_search.pl b/members/guarantor_search.pl
index d25d71f..cbd958d 100755 (executable)
--- a/members/guarantor_search.pl
+++ b/members/guarantor_search.pl
@@ -46,6 +46,7 @@ my $theme = $input->param('theme') || "default";
 
 my $member=$input->param('member');
 my $orderby=$input->param('orderby');
+my $category_type=$input->param('category_type');
 $orderby = "surname,firstname" unless $orderby;
 $member =~ s/,//g;   #remove any commas from search string
 $member =~ s/\*/%/g;
@@ -55,6 +56,11 @@ if ($member eq ''){
                $template->param(results=>1);
 }      
 
+my $search_category = 'A';
+if ($category_type eq 'P'){
+       $search_category = 'I';
+}
+
 my ($count,$results);
 my @resultsdata;
 my $background = 0;
@@ -62,11 +68,11 @@ my $background = 0;
 if ($member ne ''){
        if(length($member) == 1)
        {
-               ($count,$results)=SearchMember($member,$orderby,"simple",'A');
+               ($count,$results)=SearchMember($member,$orderby,"simple",$search_category);
        }
        else
        {
-               ($count,$results)=SearchMember($member,$orderby,"advanced",'A');
+               ($count,$results)=SearchMember($member,$orderby,"advanced",$search_category);
        }
        for (my $i=0; $i < $count; $i++){
        #find out stats
@@ -101,7 +107,7 @@ if ($member ne ''){
 $template->param( 
                        member          => $member,
                        numresults              => $count,
-                       
+                       category_type   => $category_type,
                        resultsloop     => \@resultsdata );
 
 output_html_with_http_headers $input, $cookie, $template->output;

diff --git a/members/memberentry.pl b/members/memberentry.pl
index eacb2ff..c25f7c9 100755 (executable)
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -648,6 +648,7 @@ $template->param(
   dateformat      => C4::Dates->new()->visual(),
   C4::Context->preference('dateformat') => 1,
   check_categorytype =>$check_categorytype,#to recover the category type with checkcategorytype function
+  category_type =>$category_type,
   modify          => $modify,
   nok     => $nok,#flag to konw if an error 
   CGIbranch => $CGIbranch,