From 0d1601a0c8f367537ab6b8d3ae794b4c297537b7 Mon Sep 17 00:00:00 2001
From: Karl Cordes <karlcordes@gmail.com>
Date: Tue, 11 May 2010 15:15:37 +1000
Subject: [PATCH] Finished Quick Search, and fixed view bug

---
 views/enquiries/do_search.ctp | 4 ++--
 views/enquiries/search.ctp    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/views/enquiries/do_search.ctp b/views/enquiries/do_search.ctp
index 1c6ea713..b0e00b98 100644
--- a/views/enquiries/do_search.ctp
+++ b/views/enquiries/do_search.ctp
@@ -92,7 +92,7 @@
     <?php foreach($customerResults as $custRes): ?>
     <tr>
         <td><?php echo $custRes['Customer']['name'];?></td>
-        <td><?php echo $html->link(__('View', true), array('action'=>'view', $custRes['Customer']['id'])); ?></td>
+        <td><?php echo $html->link(__('View', true), array('controller'=>'customers', 'action'=>'view', $custRes['Customer']['id'])); ?></td>
     </tr>
     <?php endforeach;?>
 </table>
@@ -117,7 +117,7 @@
         <td><?php echo $contact['Contact']['first_name'];?></td>
         <td><?php echo $contact['Contact']['last_name'];?></td>
         <td><?php echo $html->link($contact['Customer']['name'], array('controller'=> 'customers', 'action'=>'view', $contact['Customer']['id'])); ?></td>
-        <td><?php echo $html->link(__('View', true), array('action'=>'view', $contact['Contact']['id'])); ?></td>
+        <td><?php echo $html->link(__('View', true), array('controller'=>'contacts', 'action'=>'view', $contact['Contact']['id'])); ?></td>
     </tr>
     <?php endforeach;?>
 </table>
diff --git a/views/enquiries/search.ctp b/views/enquiries/search.ctp
index 8b86f738..17c70ccd 100644
--- a/views/enquiries/search.ctp
+++ b/views/enquiries/search.ctp
@@ -3,11 +3,11 @@
 <div class="customers form">
 
     <?php echo $form->create('Enquiry', array('default'=>false));
-    echo '<h2>Quick Search';
+    echo '<h2>Search';
     echo $html->image('system-search.png');
     echo '</h2>';
-
-    echo $form->input('Enquiry.search_string', array('Label'=>'Search for:', 'id'=>'searchString'));
+    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('Customer.id', array('type'=>'hidden'));