removeing comments from posts in favor of a commentable behavior. fix…

…es issue core.1
infinitas · Dec 28, 2009 · 6055ca5 · 6055ca5
1 parent 36c40db
commit 6055ca5
Show file tree

Hide file tree

Showing 7 changed files with 512 additions and 27 deletions.
diff --git a/app/app_model.php b/app/app_model.php
@@ -57,6 +57,9 @@ function save( $data = null, $validate = true, $fieldList = array() )
             $data[$this->name]['locked_by'] = null;
             $data[$this->name]['locked_since'] = null;
 
+            pr( $fieldList );
+            exit;
+
             return parent::save( $data, $validate, $fieldList );
         }
 

diff --git a/app/plugins/blog/blog_app_controller.php b/app/plugins/blog/blog_app_controller.php
@@ -58,7 +58,7 @@ function beforeFilter()
             $this->set( 'postPending', ClassRegistry::init( 'Blog.Post' )->getPending() );
             $this->set( 'postPopular', ClassRegistry::init( 'Blog.Post' )->getPopular() );
 
-            $this->set( 'commentCount', ClassRegistry::init( 'Blog.Comment' )->getCounts() );
+            $this->set( 'commentCount', ClassRegistry::init( 'Core.Comment' )->getCounts( 'Blog.Post' ) );
         }
 
         /**

diff --git a/app/plugins/blog/controllers/comments_controller.php b/app/plugins/blog/controllers/comments_controller.php
@@ -21,19 +21,7 @@ class CommentsController extends BlogAppController
     {
         var $name = 'Comments';
 
-        function add()
-        {
-            if ( !empty( $this->data ) )
-            {
-                $this->Comment->create();
-
-                if ( $this->Comment->save( $this->data ) )
-                {
-                    $this->Session->setFlash( 'Your comment has been submitted for review.' );
-                    $this->redirect( $this->referer() );
-                }
-            }
-        }
+        var $uses = array( 'Core.Comment' );
 
         function admin_index( $active = null )
         {
@@ -51,7 +39,7 @@ function admin_index( $active = null )
                     'Comment.website',
                     'Comment.comment',
                     'Comment.active',
-                    'Comment.post_id',
+                    'Comment.foreign_id',
                     'Comment.created',
                 ),
                 'conditions' => $conditions,
@@ -60,11 +48,13 @@ function admin_index( $active = null )
                     'Comment.created' => 'ASC',
                 ),
                 'limit' => 20,
-                'contain' => array(
-                    'Post' => array(
-                        'fields' => array(
-                            'Post.title',
-                            'Post.slug',
+                'Comment' => array(
+                    'contain' => array(
+                        'Post' => array(
+                            'fields' => array(
+                                'Post.title',
+                                'Post.slug'
+                            )
                         )
                     )
                 )
@@ -114,6 +104,5 @@ function admin_perge( $date = null )
 
             $this->Session->setFlash( sprintf( '%s %s', $i, __( 'Comments deleted', true ) ) );
         }
-
     }
 ?>
diff --git a/app/plugins/blog/controllers/posts_controller.php b/app/plugins/blog/controllers/posts_controller.php
@@ -153,9 +153,9 @@ function admin_dashboard()
                         'Post.created'
                     ),
                     'feed' => array(
-                        'Blog.Comment' => array(
+                        'Core.Comment' => array(
                             'setup' => array(
-                                'plugin' => 'Blog',
+                                'plugin' => 'Core',
                                 'controller' => 'comments',
                                 'action' => 'view',
                             ),
@@ -177,7 +177,7 @@ function admin_dashboard()
 
             $this->set( 'dashboardPostCount', $this->Post->getCounts() );
             $this->set( 'dashboardPostLatest', $this->Post->getLatest() );
-            $this->set( 'dashboardCommentsCount', $this->Post->Comment->getCounts() );
+            $this->set( 'dashboardCommentsCount', $this->Post->Comment->getCounts( 'Blog.Post' ) );
         }
 
         function admin_index( $active = null )

diff --git a/app/plugins/blog/models/post.php b/app/plugins/blog/models/post.php
@@ -70,8 +70,8 @@ class Post extends BlogAppModel
 
         var $hasMany = array(
             'Comment' => array(
-                'className' => 'Blog.Comment',
-                'foreignKey' => 'post_id',
+                'className' => 'Core.Comment',
+                'foreignKey' => 'foreign_id',
                 'dependent' => true
             )
         );
@@ -239,7 +239,7 @@ function getLatest( $limit = 10, $active = 1 )
             return $posts;
         }
 
-        function getCounts()
+        function getCounts( $model = null )
         {
             $counts = Cache::read( 'posts_count' );
             if ( $counts !== false )