springup/cmc-sales
2
0
Fork 0
Code Issues 49 Pull requests Actions Packages Projects Releases Wiki Activity

Purging program of Binary BLOBS. Die blobs. Die

Browse source
This commit is contained in:
Karl Cordes 2009-09-18 16:16:42 +10:00
parent 4dbbeed27f
commit bab0ee9970
4 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -7,3 +7,4 @@ tmp/tests/*
*.tar.gz *.tar.gz
*.swp *.swp
*.swo *.swo
vapourama/*

4
controllers/enquiries_controller.php
View file

@ -43,7 +43,7 @@ class EnquiriesController extends AppController {
//$this->set('quotes', $enquiry['Quote']); //$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('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. /* 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 * 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_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_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'])); $this->set('principle_emails', $this->Enquiry->Principle->PrincipleContact->findAllByPrincipleId($enquiry['Enquiry']['principle_id']));

12
models/enquiry.php
View file

@ -169,15 +169,17 @@ class Enquiry extends AppModel {
'finderQuery' => '', 'finderQuery' => '',
'counterQuery' => '' 'counterQuery' => ''
), ),
'EnquiryFile' => array('className' => 'EnquiryFile',
'foreignKey' => 'enquiry_id',
'dependent' => false
),
'Email' => array('className' => 'Email', /* 'EnquiryFile' => array('className' => 'EnquiryFile',
'foreignKey' => 'enquiry_id',
'dependent' => false
),*/
/*'Email' => array('className' => 'Email',
'foreignKey' => 'enquiry_id', 'foreignKey' => 'enquiry_id',
'dependent' => false 'dependent' => false
), ),
*/
); );
var $hasOne = array('EnquiryEmailQueue'); var $hasOne = array('EnquiryEmailQueue');

10
views/enquiries/view.ctp
View file

@ -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); ?>
<?php echo $this->element('email_table_ajax', $enquiry, array('cache'=>'+1 day')); ?> <?php echo $this->element('email_table_ajax', $enquiry, array('cache'=>'+1 day')); ?>
</div> </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); ?> <?php echo $this->element('quote_table', $quotes); ?>
</div> </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>