Changeset 775 for trunk/app

Timestamp:

09/23/08 21:41:15 (2 months ago)

Author:

aarkerio

Message:

Test Unit fixed

Location:

trunk/app/controllers

Files:

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

trunk/app/controllers/comments_controller.php

@@ -33 +33 @@
       if ($this->Comment->save($this->data)):
            $this->msgFlash(__('Comment added', true), $this->data['Comment']['redirect_to'].'/#comments');
-      else:
-           $this->flash('Problem, please report', $this->data['Comment']['redirect_to'].'/#comments');
       endif;
     endif;
@@ -40 +38 @@
  
   /**    ===== 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

trunk/app/controllers/discussions_controller.php

@@ -89 +89 @@
 
     //Do not pass any args to send() 
-    if ( $this->Email->send() ) 
-    {
-            return true; 
-    } 
-    else
-    {
-            return false;
-    }
+    if ( $this->Email->send() ):
+        return true;
+    else:
+         return false;
+    endif;
  }