diff --git a/controllers/emails_controller.php b/controllers/emails_controller.php index 8829a46a..70714f10 100755 --- a/controllers/emails_controller.php +++ b/controllers/emails_controller.php @@ -9,6 +9,7 @@ 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, 'limit' => 150, 'order'=>array('Email.id' => 'desc') @@ -114,6 +115,8 @@ class EmailsController extends AppController { $userMail = $this->paginate('Email'); //$userMail = $this->Email->find('all', array('conditions'=>array('Email.id'=>$allIDs), 'order'=>array('Email.udate DESC'))); $this->set('userMail', $userMail); + + } } diff --git a/views/emails/view_user_emails.ctp b/views/emails/view_user_emails.ctp index 2ec317f5..68fda625 100644 --- a/views/emails/view_user_emails.ctp +++ b/views/emails/view_user_emails.ctp @@ -28,7 +28,7 @@ User Emailimage('internet-mail.png'); ?> - +
diff --git a/views/users/view_user.ctp b/views/users/view_user.ctp index 97b91fc8..caa75838 100644 --- a/views/users/view_user.ctp +++ b/views/users/view_user.ctp @@ -52,7 +52,7 @@ -
+
diff --git a/webroot/js/ajax_pagination_email.js b/webroot/js/ajax_pagination_email.js index 092e5c52..f8f4960f 100644 --- a/webroot/js/ajax_pagination_email.js +++ b/webroot/js/ajax_pagination_email.js @@ -4,7 +4,7 @@ $(function() { $(".pagingEmail").find('a').click(function() { - + alert("BOO"); $('#emailTable').fadeOut('slow'); $("#ajaxLoadEmail").bind("ajaxSend", function() { diff --git a/webroot/js/view_user.js b/webroot/js/view_user.js index 0cb79f1b..8f4a17ec 100644 --- a/webroot/js/view_user.js +++ b/webroot/js/view_user.js @@ -4,11 +4,7 @@ $(function() { $('#enquiryTable').hide(); $("#ajaxLoadEnquiry").hide(); - $("#ajaxLoadEnquiry").bind("ajaxSend", function() { - $(this).show(); - }).bind("ajaxComplete", function() { - $(this).hide(); - }); + @@ -32,7 +28,10 @@ $(function() { $('#show').click(function() { $(this).hide(); $('#hide').show(); - $('#enquiryTable').slideDown('fast'); + $("#ajaxLoadEnquiry").show(); + $('#enquiryTable').slideDown('fast', function() { + $("#ajaxLoadEnquiry").hide(); + }); }); diff --git a/webroot/js/view_user_email.js b/webroot/js/view_user_email.js index 52eaee6a..1dd54404 100644 --- a/webroot/js/view_user_email.js +++ b/webroot/js/view_user_email.js @@ -1,18 +1,9 @@ $(function() { $('#hideEmail').hide(); + $('#emailTable').hide(); - $("#ajaxLoadEmail").hide(); - $("#ajaxLoadEmail").bind("ajaxSend", function() { - $(this).show(); - }).bind("ajaxComplete", function() { - $(this).hide(); - - }); - - - var userID = $('#userID').text(); @@ -21,18 +12,21 @@ $(function() { $('#hideEmail').click(function() { $(this).hide(); $('#showEmail').show(); - $('#emailTable').slideUp('fast'); }); $('#showEmail').click(function() { - $(this).hide(); - $('#hideEmail').show(); + + $('#showEmail').hide(); + $("#ajaxLoadEmail").show(); + $.get('/emails/view_user_emails/'+userID, function(data) { $('#emailTable').html(data); - $('#emailTable').slideDown('fast'); - + $('#emailTable').slideDown('fast', function() { + $('#ajaxLoadEmail').hide(); + }); + $('#hideEmail').show(); }); });