From bab0ee997025d9a648f96f36a38b7ad63ed89bad Mon Sep 17 00:00:00 2001
From: Karl Cordes <karlcordes@gmail.com>
Date: Fri, 18 Sep 2009 16:16:42 +1000
Subject: [PATCH] Purging program of Binary BLOBS. Die blobs. Die

---
 .gitignore                           |  1 +
 controllers/enquiries_controller.php |  4 ++--
 models/enquiry.php                   |  8 +++++---
 views/enquiries/view.ctp             | 10 ++++++----
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 837bba12..bfb2a49c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ tmp/tests/*
 *.tar.gz
 *.swp
 *.swo
+vapourama/*
diff --git a/controllers/enquiries_controller.php b/controllers/enquiries_controller.php
index 68957813..4e747c00 100755
--- a/controllers/enquiries_controller.php
+++ b/controllers/enquiries_controller.php
@@ -43,7 +43,7 @@ class EnquiriesController extends AppController {
 		
 		//$this->set('quotes', $enquiry['Quote']);
 		$this->set('quotes', $this->Enquiry->Quote->find('all', array('recursive' => 0, 'conditions'=>array('Quote.enquiry_id'=>$id), 'order'=>'Quote.revision DESC')));
-		$this->set('files', $this->Enquiry->EnquiryFile->find('all', array('conditions' => array('EnquiryFile.enquiry_id'=>$id), 'order' => 'EnquiryFile.created ASC')));
+		//$this->set('files', $this->Enquiry->EnquiryFile->find('all', array('conditions' => array('EnquiryFile.enquiry_id'=>$id), 'order' => 'EnquiryFile.created ASC')));
 		
 		/* Trying to optimise the queries for this part of the view - it's currently getting bogged down checking Email Attachments.
 		 * Going to create an array describing whether a particular email ID has an attachment. Trying to avoid checking binary data in a find('all') call
@@ -64,7 +64,7 @@ class EnquiriesController extends AppController {
 		$this->set('number_of_emails', $this->Enquiry->Email->find('count', array('conditions'=>array('Email.enquiry_id'=>$id))));
  */
 		$this->set('number_of_quotes', $this->Enquiry->Quote->find('count', array('conditions'=>array('Quote.enquiry_id'=>$id))));		
-		$this->set('number_of_files', $this->Enquiry->EnquiryFile->find('count', array('conditions' => array('EnquiryFile.enquiry_id'=>$id))));
+		//$this->set('number_of_files', $this->Enquiry->EnquiryFile->find('count', array('conditions' => array('EnquiryFile.enquiry_id'=>$id))));
 		$this->set('principle_emails', $this->Enquiry->Principle->PrincipleContact->findAllByPrincipleId($enquiry['Enquiry']['principle_id']));
 
 		
diff --git a/models/enquiry.php b/models/enquiry.php
index 518f3182..011321a7 100755
--- a/models/enquiry.php
+++ b/models/enquiry.php
@@ -169,15 +169,17 @@ class Enquiry extends AppModel {
 								'finderQuery' => '',
 								'counterQuery' => ''
 			),
-			'EnquiryFile' => array('className' => 'EnquiryFile',
+			
+			/* 'EnquiryFile' => array('className' => 'EnquiryFile',
 									'foreignKey' => 'enquiry_id',
 									'dependent' => false
-									),
+									),*/
 	
-			'Email' => array('className' => 'Email',
+			/*'Email' => array('className' => 'Email',
 									'foreignKey' => 'enquiry_id',
 									'dependent' => false
 									),
+									*/
 	);
 
 	var $hasOne = array('EnquiryEmailQueue');
diff --git a/views/enquiries/view.ctp b/views/enquiries/view.ctp
index 5450ed1f..dedc7499 100755
--- a/views/enquiries/view.ctp
+++ b/views/enquiries/view.ctp
@@ -123,6 +123,12 @@ $boxdata['enquirynumber'] = $enquiry['Enquiry']['title'];
 	<?php //echo $this->element('email_table_ajax', $enquiry); ?>
 	<?php echo $this->element('email_table_ajax', $enquiry, array('cache'=>'+1 day')); ?>
 </div>
+<div class="related">
+	<h3><?php __($number_of_files.' Files in this Enquiry');?><?php echo $html->image('document.png'); ?></h3>
+	<?php echo $this->element('enquiry_file_table', $files); ?>
+</div>
+
+ *
  */
 ?>
 
@@ -131,8 +137,4 @@ $boxdata['enquirynumber'] = $enquiry['Enquiry']['title'];
 	<?php echo $this->element('quote_table', $quotes); ?>
 </div>
 
-<div class="related">
-	<h3><?php __($number_of_files.' Files in this Enquiry');?><?php echo $html->image('document.png'); ?></h3>
-	<?php echo $this->element('enquiry_file_table', $files); ?>
-</div>