Changeset 776 for trunk/app/controllers

Timestamp:

09/23/08 22:04:26 (2 months ago)

Author:

aarkerio

Message:

Test Unit fixed

Location:

trunk/app/controllers

Files:

• comments_controller.php (modified) (2 diffs)
• entries_controller.php (modified) (1 diff)

trunk/app/controllers/comments_controller.php

@@ -37 +37 @@
   }
  
-  /**    ===== ADMIN METHODS ====== **/
- public function admin_listing($paginate=0, $limit=20)
- {
-   $this->layout    = 'admin';
-
-   $this->pageTitle = __('Comments on entries', true);
-
-   //$this->Comment->bindModel(array('belongsTo'=> array('News' =>array('className'=> 'News', 'foreignKey'=> 'new_id' ))));   
-   
-   $this->paginate['fields'] = array('Comment.id','Entry.id','Entry.title','Comment.id','Comment.comment', 'Comment.created', 'Comment.user_id', 'Comment.status', 'User.username'); 
-   $this->paginate['conditions']   = null;
-   $this->paginate['order']        = "Comment.id DESC";
-   $this->paginate['limit']        = 30;
-   $data = $this->paginate('Comment');
-   $this->set(compact('data'));
-    
- }
- 
-  // change status enabled/disabled actived
-  public function admin_change($comment_id, $status)
-  { 
+ /**    ===== ADMIN METHODS ====== **/
+ // change status enabled/disabled actived
+ public function admin_change($comment_id, $status)
+ { 
     $this->data['Comment']['status'] = ($status == 0 ) ? 1 : 0;
      
@@ -87 +70 @@
   {
     if ($this->Comment->del($comment_id)):
-       $this->msgFlash('Comment deleted', '/admin/comments/listing');
+       $this->msgFlash(__('Comment deleted', true), '/admin/entries/comments/');
     endif;
   }

trunk/app/controllers/entries_controller.php

@@ -95 +95 @@
   $order           = 'Entry.id DESC';
   $limit           = 20;
-      
+  
   $entries = $this->Entry->findAll($conditions, $fields, $order, $limit);
-  
   $this->set(compact('channelData', 'entries'));
-
  }