From 36446f7fcd280556a045e8842cd866cbb7b39f7b Mon Sep 17 00:00:00 2001
From: Karl Cordes <karlcordes@gmail.com>
Date: Tue, 11 May 2010 16:54:45 +1000
Subject: [PATCH] Fixed Search controller prob

---
 controllers/enquiries_controller.php | 2 +-
 views/enquiries/do_search.ctp        | 5 +++++
 views/enquiries/search.ctp           | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/controllers/enquiries_controller.php b/controllers/enquiries_controller.php
index 04428cb4..d684d345 100755
--- a/controllers/enquiries_controller.php
+++ b/controllers/enquiries_controller.php
@@ -460,7 +460,7 @@ class EnquiriesController extends AppController {
 
             $customerResults = $this->Enquiry->Customer->find('all', array('conditions' => $custConditions, 'recursive'=>0));
             $enquiryResults = $this->Enquiry->find('all', array('conditions'=>$enqConditions, 'recursive'=>0));
-            $contactResults = $this->Enquiry->find('all', array('conditions'=>$contactConditions, 'recursive'=>0));
+            $contactResults = $this->Enquiry->Contact->find('all', array('conditions'=>$contactConditions, 'recursive'=>0));
 
             $searchDone = true;
 
diff --git a/views/enquiries/do_search.ctp b/views/enquiries/do_search.ctp
index b0e00b98..02dd941e 100644
--- a/views/enquiries/do_search.ctp
+++ b/views/enquiries/do_search.ctp
@@ -122,3 +122,8 @@
     <?php endforeach;?>
 </table>
 <?php endif;?>
+
+<?php if( ($contactCount == 0) && ($enqCount == 0) && ($custCount == 0) ) {
+    echo "<h2>No matching records found :( Try modifying your search terms</h2>";
+}
+?>
diff --git a/views/enquiries/search.ctp b/views/enquiries/search.ctp
index 17c70ccd..cad08fbe 100644
--- a/views/enquiries/search.ctp
+++ b/views/enquiries/search.ctp
@@ -7,7 +7,7 @@
     echo $html->image('system-search.png');
     echo '</h2>';
     echo "<p>Enter part of an Enquiry Number, Customer Name or Contact Name</p>";
-    echo $form->input('Enquiry.search_string', array('label'=>'Search', 'id'=>'searchString'));
+    echo $form->input('Enquiry.search_string', array('label'=>false, 'id'=>'searchString'));
 
     //echo $form->input('Customer.id', array('type'=>'hidden'));