Changeset 776 for trunk

Timestamp:

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

Author:

aarkerio

Message:

Test Unit fixed

Location:

trunk/app

Files:

• controllers/comments_controller.php (modified) (2 diffs)
• controllers/entries_controller.php (modified) (1 diff)
• models/entry.php (modified) (2 diffs)
• views/entries/admin_comments.ctp (modified) (2 diffs)
• views/entries/admin_listing.ctp (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'));
-
  }
  

trunk/app/models/entry.php

@@ -24 +24 @@
  public $hasMany = array('Comment' =>
                          array('className'     => 'Comment',
-                               'conditions'    =>  null,
+                               'conditions'    => 'Comment.status = 1',
                                'order'         => 'Comment.created',
                                'limit'         => null,
@@ -52 +52 @@
  public function getComments($blogger_id)
  {
+  $this->unbindAll();
+  
+  $this->bindModel(array('hasMany' => array('Comment' =>
+                         array('className'     => 'Comment',
+                               'conditions'    => null,
+                               'order'         => 'Comment.created',
+                               'limit'         => null,
+                               'foreignKey'    => 'entry_id',
+                               'dependent'     => true,
+                               'exclusive'     => false,
+                               'finderQuery'   => ''
+                         )
+                  )));
+
   $conditions   = array('Entry.user_id'=>$blogger_id);
   $fields       = array('Entry.title', 'Entry.id');

trunk/app/views/entries/admin_comments.ctp

@@ -3 +3 @@
 //debug($data);
 foreach($data as $v):
- $tmp  = $html->para(null, $html->link($v['Entry']['title'], 'http://'.$_SERVER['HTTP_HOST'].'/users/entry/'.$session->read('Auth.User.username').'/'.$v['Entry']['id']));
-
+ $tmp  = $html->para(null, 'Entry: '.$html->link($v['Entry']['title'], 'http://'.$_SERVER['HTTP_HOST'].'/entries/view/'.$session->read('Auth.User.username').'/'.$v['Entry']['id']), array('style'=>'font-size:14pt;font-weigth:bold;'));
+ 
  foreach($v['Comment'] as $c):
    $st = $c['status'] == 1 ? __('Published', true) : __('Hidden', true);
@@ -15 +15 @@
  endforeach;
 
- echo $html->div(null, $tmp, array('style'=>'border:2px solid gray;margin-top:14px;padding:4px;'));
+ echo $html->div(null, $tmp, array('style'=>'border:1px dotted gray;margin-top:14px;padding:4px;'));
 endforeach;
 ?>

trunk/app/views/entries/admin_listing.ctp

@@ -4 +4 @@
 echo $html->addCrumb('Control Panel', '/admin/entries/start');
 echo $html->getCrumbs(' / '); 
-
 echo $html->div('title_section', __('Entries', true)); 
 
-echo $html->para(null, $html->link($html->image('actions/new.png', array('alt'=>__('Add new', true), 'title'=>__('Add new', true))), '/admin/entries/add', null, false, false) . '     '.$html->link($html->image('static/forum.gif', array("alt"=>"See comments", "title"=>"See comments")), '/admin/comments/listing', null, false, false));
+echo $html->para(null, $html->link($html->image('actions/new.png', array('alt'=>__('Add new', true), 'title'=>__('Add new', true))), '/admin/entries/add', null, false, false) . '     '.$html->link($html->image('static/forum.gif', array('alt'=>__('See comments', true),'title'=>__('See comments', true))), '/admin/entries/comments', null, false, false));
 
 ?>