Changeset 773 for trunk/app/controllers

Timestamp:

09/22/08 23:22:18 (2 months ago)

Author:

aarkerio

Message:

Test Unit fixed

Location:

trunk/app/controllers

Files:

• chats_controller.php (modified) (1 diff)
• messages_controller.php (modified) (1 diff)
• vclassrooms_controller.php (modified) (1 diff)

trunk/app/controllers/chats_controller.php

@@ -46 +46 @@
  public function getMessages($vclassroom_id)
  {
-   $conditions = array('Chat.vclassroom_id'=>$vclassroom_id);
-   $fields = array('Chat.message', 'Chat.created', 'User.username');;
-   $order = 'Chat.id DESC';
-   $limit = 15;
+   $this->layout = 'ajax';
+   $conditions   = array('Chat.vclassroom_id'=>$vclassroom_id);
+   $fields       = array('Chat.message', 'Chat.created', 'User.username');;
+   $order        = 'Chat.id DESC';
+   $limit        = 15;
      
    $this->set('data', $this->Chat->findAll($conditions, $fields, $order, $limit));

trunk/app/controllers/messages_controller.php

@@ -206 +206 @@
    foreach ($this->data['Message'] as $v):
      if ( $v != 0):
-                       $this->Message->del($v);
+               $this->Message->del($v);
          endif;
    endforeach;
             
-   $this->msgFlash('Message deleted.','/messages/listing');
+   $this->msgFlash(__('Data removed', true),'/messages/listing');
  }
 

trunk/app/controllers/vclassrooms_controller.php

@@ -51 +51 @@
    // student belongs to this class?
    if ( $this->Auth->user()):
-             $this->set('belongs', $this->Vclassroom->belongs($this->Auth->user('id'), $vclassroom_id));
+       $this->set('belongs', $this->Vclassroom->belongs($this->Auth->user('id'), $vclassroom_id));
    else:
-             $this->set('belongs', false);
+       $this->set('belongs', false);
    endif;
    $this->Vclassroom->unbindAll();