Fix for bug 1666

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/C4/Members.pm b/C4/Members.pm
index 9c60562..2843d51 100644 (file)
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -1505,7 +1505,8 @@ sub GetCities {
 #test to know if the table contain some records if no the function return nothing
     my $id = @id;
     $sth->finish;
-    if ( $id eq 0 ) {
+    if ( $id == 1 ) {
+               # all we have is the one blank row
         return ();
     }
     else {
@@ -1689,8 +1690,14 @@ Looks up the different title . Returns array  with all borrowers title
 sub GetTitles {
     my @borrowerTitle = split /,|\|/,C4::Context->preference('BorrowersTitles');
     unshift( @borrowerTitle, "" );
-    return ( \@borrowerTitle);
-    }
+       my $count=@borrowerTitle;
+       if ($count == 1){
+               return ();
+       }
+       else {
+               return ( \@borrowerTitle);
+       }
+}
 
 
 

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 758e85d..2d5630c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -130,6 +130,7 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --><!-- /
                <legend><!--TMPL_IF Name="I"-->Organisation <!--TMPL_ELSE-->Patron <!--/TMPL_IF-->identity</legend>
                <ol>
                <!-- TMPL_UNLESS name="I" -->
+               <!-- TMPL_IF NAME="title_cgipopup" -->
             <li>
             <!-- TMPL_IF NAME="mandatorytitle" -->
                 <label for="btitle" class="required">
@@ -140,6 +141,7 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --><!-- /
             <!-- TMPL_VAR NAME="borrotitlepopup" -->
             <!-- TMPL_IF NAME="mandatorytitle" --><span class="required">Required</span><!-- /TMPL_IF -->
             </li>
+               <!-- /TMPL_IF -->
         <!-- /TMPL_UNLESS -->
                <li>
                <!-- TMPL_IF NAME="mandatorysurname" -->

diff --git a/members/memberentry.pl b/members/memberentry.pl
index a9a593c..c2ac533 100755 (executable)
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -322,6 +322,9 @@ if ($select_city eq '' ){
 }
 my($cityid);
 ($cityid,$name_city)=GetCities();
+if ($cityid) {
+       warn "hey hey waht the?";
+       }
 $template->param( city_cgipopup => 1) if ($cityid );
 my $citypopup = CGI::popup_menu(-name=>'select_city',
         -id => 'select_city',
@@ -345,6 +348,7 @@ my $roadpopup = CGI::popup_menu(-name=>'streettype',
 my $default_borrowertitle;
 $default_borrowertitle=$data{'title'} ;
 my($borrowertitle)=GetTitles();
+$template->param( title_cgipopup => 1) if ($borrowertitle);
 my $borrotitlepopup = CGI::popup_menu(-name=>'title',
         -id => 'btitle',
         -values=>$borrowertitle,