From 013db463b7c495acdb2b5a7e51b4be58defbd2f8 Mon Sep 17 00:00:00 2001 From: Karl Cordes Date: Mon, 21 Mar 2011 16:08:07 +1100 Subject: [PATCH] Improving email view user query using containable --- controllers/emails_controller.php | 9 +++++---- models/email.php | 3 +++ models/email_attachment.php | 2 ++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/controllers/emails_controller.php b/controllers/emails_controller.php index 70714f10..cdaed44b 100755 --- a/controllers/emails_controller.php +++ b/controllers/emails_controller.php @@ -8,9 +8,8 @@ class EmailsController extends AppController { var $paginate = array( - 'fields'=> array('Email.id', 'Email.user_id', 'Email.subject','Email.udate','User.id','User.first_name','User.last_name','User.email'), - 'contain' => false, + 'contain' => array('User', 'EmailRecipient'), 'limit' => 150, 'order'=>array('Email.id' => 'desc') @@ -106,9 +105,11 @@ class EmailsController extends AppController { - $this->paginate = array( + $this->paginate['Email'] = array( 'conditions' => array('Email.id'=>$allIDs), - 'order'=>array('Email.udate DESC') + 'order'=>array('Email.udate DESC'), + 'contain' => array('EmailRecipient', 'User'), + 'limit' => 100, ); diff --git a/models/email.php b/models/email.php index fec7ee40..a4780488 100755 --- a/models/email.php +++ b/models/email.php @@ -6,6 +6,9 @@ class Email extends AppModel { var $recursive = 1; + + var $actsAs = array('Containable'); + var $order = "Email.udate DESC"; var $hasMany = array( diff --git a/models/email_attachment.php b/models/email_attachment.php index e03dc9b5..435f9b9c 100755 --- a/models/email_attachment.php +++ b/models/email_attachment.php @@ -6,6 +6,8 @@ class EmailAttachment extends AppModel { var $order = "EmailAttachment.size DESC"; + var $actsAs = array('Containable'); + var $belongsTo = array( 'Email' => array('className' => 'Email',