Changed user view to load enquiry table by default

This commit is contained in:
Karl Cordes 2011-03-17 12:48:27 +11:00
parent 01dfc91cee
commit b233ead647
2 changed files with 37 additions and 27 deletions

View file

@ -82,6 +82,26 @@ class EmailsController extends AppController {
} }
/**
* Fetch all the Emails that are from, to, cc a User ID
*
* @param <type> $id
* @return <type>
*/
function view_user_emails($id) {
if(!$id) {
return;
}
else {
$fromEmails = $this->Email->find('list', array('fields'=>array('Email.id'), 'recursive'=>0, 'conditions'=>array('Email.user_id'=>$id)));
$recEmails = $this->Email->EmailRecipient->find('all', array('fields'=>array('Email.id'),'recursive'=>0, 'conditions'=>array('EmailRecipient.user_id'=>$id)));
$this->set('emails', $fromEmails);
$this->set('recEmails', $recEmails);
}
}
/* old shit here, Might be useful */ /* old shit here, Might be useful */
@ -100,14 +120,7 @@ class EmailsController extends AppController {
} }
/**
* View Emails to, from or CC a particular user ID.
*
*
*/
function view_user_emails($id) {
}
} }
?> ?>

View file

@ -1,6 +1,6 @@
$(function() { $(function() {
$('#hide').hide(); $('#show').hide();
$('#enquiryTable').hide(); $('#enquiryTable').hide();
$("#ajaxLoad").hide(); $("#ajaxLoad").hide();
@ -14,19 +14,8 @@ $(function() {
var userID = $('#userID').text(); var userID = $('#userID').text();
var alreadyFetched = false; $.get('/enquiries/view_user_enquiries/'+userID, function(data) {
$('#enquiryTable').html(data);
$('#show').click(function() {
$(this).hide();
$('#hide').show();
if(alreadyFetched == false) {
alreadyFetched = true;
}
$.get('/enquiries/view_user_enquiries/'+userID, function(data) {
$('#enquiryTable').html(data);
});
$('#enquiryTable').slideDown('fast'); $('#enquiryTable').slideDown('fast');
}); });
@ -37,6 +26,14 @@ $(function() {
$('#show').show(); $('#show').show();
$('#enquiryTable').slideUp('fast'); $('#enquiryTable').slideUp('fast');
});
$('#show').click(function() {
$(this).hide();
$('#hide').show();
$('#enquiryTable').slideDown('fast');
}); });