Merge pull request #1 from IamPersistent/update

Update
ornicar · Aug 8, 2011 · bd0f2fd · bd0f2fd
2 parents b364f71 + e313a5a
commit bd0f2fd
Show file tree

Hide file tree

Showing 12 changed files with 82 additions and 2 deletions.
diff --git a/app/config/comment.yml b/app/config/comment.yml
@@ -3,6 +3,7 @@ fos_comment:
     class:
         model:
             comment: Ltc\CommentBundle\Document\Comment
+            thread: Ltc\CommentBundle\Document\Thread
     form:
         comment:
             type: ltc_comment.comment

diff --git a/app/config/config_local.yml.dist b/app/config/config_local.yml.dist
@@ -1,6 +1,5 @@
 framework:
-    csrf_protection:
-        secret: s3cr3t
+    secret: s3cr3t
 
 apc:
     host: http://ltc

diff --git a/src/Ltc/ArticleBundle/Form/ArticleFormType.php b/src/Ltc/ArticleBundle/Form/ArticleFormType.php
@@ -24,4 +24,9 @@ public function buildForm(FormBuilder $builder, array $options)
             $builder->add('category');
         }
     }
+
+    public function getName()
+    {
+        return 'article';
+    }
 }
diff --git a/src/Ltc/CommentBundle/Document/Comment.php b/src/Ltc/CommentBundle/Document/Comment.php
@@ -27,6 +27,31 @@ class Comment extends BaseComment
      */
     protected $authorName = 'Anonyme';
 
+    /**
+     * Thread of this comment
+     *
+     * @var Thread
+     * @MongoDB\ReferenceOne(targetDocument="MyProject\MyBundle\Document\Thread")
+     */
+    protected $thread;
+
+    /**
+     * @return Thread
+     */
+    public function getThread()
+    {
+        return $this->thread;
+    }
+
+    /**
+     * @param Thread $thread
+     * @return null
+     */
+    public function setThread(Thread $thread)
+    {
+        $this->thread = $thread;
+    }
+
     /**
      * Get authorName
      * @return string

diff --git a/src/Ltc/CommentBundle/Document/Thread.php b/src/Ltc/CommentBundle/Document/Thread.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Ltc\CommentBundle\Document;
+
+use FOS\CommentBundle\Document\Thread as BaseThread;
+use Doctrine\ODM\MongoDB\Mapping\Annotations as MongoDB;
+
+/**
+ * @MongoDB\Document
+ * @MongoDB\ChangeTrackingPolicy("DEFERRED_EXPLICIT")
+ */
+class Thread extends BaseThread
+{
+
+}
diff --git a/src/Ltc/CommentBundle/Form/CommentFormType.php b/src/Ltc/CommentBundle/Form/CommentFormType.php
@@ -19,4 +19,9 @@ public function buildForm(FormBuilder $builder, array $options)
 
         $builder->add('authorName', 'text');
     }
+
+    public function getName()
+    {
+        return 'comment';
+    }
 }
diff --git a/src/Ltc/ConfigBundle/Form/AuthorType.php b/src/Ltc/ConfigBundle/Form/AuthorType.php
@@ -25,4 +25,9 @@ public function getDefaultOptions(array $options)
             'data_class' => 'Ltc\ConfigBundle\Document\Author',
         );
     }
+
+    public function getName()
+    {
+        return 'author';
+    }
 }
diff --git a/src/Ltc/ConfigBundle/Form/FeaturedArticleType.php b/src/Ltc/ConfigBundle/Form/FeaturedArticleType.php
@@ -19,4 +19,9 @@ public function getDefaultOptions(array $options)
             'data_class' => 'Ltc\ConfigBundle\Document\FeaturedArticle',
         );
     }
+
+    public function getName()
+    {
+        return 'featured_article';
+    }
 }
diff --git a/src/Ltc/ConfigBundle/Form/FeaturedStoryType.php b/src/Ltc/ConfigBundle/Form/FeaturedStoryType.php
@@ -18,4 +18,9 @@ public function getDefaultOptions(array $options)
             'data_class' => 'Ltc\ConfigBundle\Document\FeaturedStory',
         );
     }
+
+    public function getName()
+    {
+        return 'featured_story';
+    }
 }
diff --git a/src/Ltc/ConfigBundle/Form/PhotoType.php b/src/Ltc/ConfigBundle/Form/PhotoType.php
@@ -23,4 +23,9 @@ public function getDefaultOptions(array $options)
             'data_class' => 'Ltc\ConfigBundle\Document\Photo',
         );
     }
+
+    public function getName()
+    {
+        return 'article';
+    }
 }
diff --git a/src/Ltc/DocBundle/Form/DocFormType.php b/src/Ltc/DocBundle/Form/DocFormType.php
@@ -23,4 +23,9 @@ public function buildForm(FormBuilder $builder, array $options)
             ->add('image', 'ltc_image')
         ;
     }
+
+    public function getName()
+    {
+        return 'doc';
+    }
 }
diff --git a/src/Ltc/StoryBundle/Form/StoryFormType.php b/src/Ltc/StoryBundle/Form/StoryFormType.php
@@ -16,4 +16,9 @@ public function buildForm(FormBuilder $builder, array $options)
             ->add('authorName')
         ;
     }
+
+    public function getName()
+    {
+        return 'story';
+    }
 }