ORM Relations

sourcefabric · Apr 28, 2014 · ffb8653 · ffb8653
1 parent 27c0e2e
commit ffb8653
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 6 deletions.
diff --git a/newscoop/application/configs/symfony/config.yml b/newscoop/application/configs/symfony/config.yml
@@ -94,6 +94,9 @@ jms_serializer:
  Newscoop_Image:
  namespace_prefix: Newscoop\Image
  path: "@NewscoopGimmeBundle/Resources/config/serializer/newscoop"
+ Newscoop_Snippet:
+ namespace_prefix: Newscoop\Entity\Snippet
+ path: "@NewscoopGimmeBundle/Resources/config/serializer/newscoop"
 
 
 # SensioExtraBundle Configuration

diff --git a/newscoop/library/Newscoop/Entity/Snippet.php b/newscoop/library/Newscoop/Entity/Snippet.php
@@ -43,9 +43,8 @@ class Snippet
  protected $name;
 
  /**
- * @ORM\OneToMany(targetEntity="Newscoop\Entity\Snippet\SnippetField", mappedBy="snippet", cascade={"persist"})
- * @ORM\JoinColumn(name="FieldId", referencedColumnName="Id")
- * @var Newscoop\Entity\Snippet\SnippetField
+ * @ORM\OneToMany(targetEntity="Newscoop\Entity\Snippet\SnippetField", mappedBy="snippet", cascade={"persist", "remove"})
+ * @var Doctrine\Common\Collections\ArrayCollection
  */
  protected $fields;
 
@@ -117,6 +116,7 @@ public function setTemplate(SnippetTemplate $template)
 
  foreach ($template->getFields() as $templateField) {
  $field = new SnippetField();
+ $field->setSnippet($this);
  $field->setTemplateField($templateField);
  $this->addField($field);
  }

diff --git a/newscoop/library/Newscoop/Entity/Snippet/SnippetField.php b/newscoop/library/Newscoop/Entity/Snippet/SnippetField.php
@@ -29,14 +29,14 @@ class SnippetField
 
  /**
  * @ORM\ManyToOne(targetEntity="Newscoop\Entity\Snippet", inversedBy="fields")
- * @ORM\JoinColumn(name="SnippetId", referencedColumnName="Id")
+ * @ORM\JoinColumn(name="SnippetId", referencedColumnName="Id", nullable=false)
  * @var Newscoop\Entity\Snippet
  */
  protected $snippet;
 
  /**
  * @ORM\OneToOne(targetEntity="Newscoop\Entity\Snippet\SnippetTemplate\SnippetTemplateField")
- * @ORM\JoinColumn(name="TemplateId", referencedColumnName="Id")
+ * @ORM\JoinColumn(name="TemplateId", referencedColumnName="Id", nullable=false)
  * @var Newscoop\Entity\Snippet\SnippetTemplate\SnippetTemplateField
  */
  protected $field;
@@ -71,6 +71,32 @@ public function setId($id)
  return $this;
  }
 
+ /**
+ * Getter for snippet
+ *
+ * @return mixed
+ */
+ public function getSnippet()
+ {
+ return $this->snippet;
+ }
+
+ /**
+ * Setter for snippet
+ *
+ * @param mixed $snippet Value to set
+ *
+ * @return self
+ */
+ public function setSnippet($snippet)
+ {
+
+ $this->snippet = $snippet;
+
+ return $this;
+ }
+
+
  /**
  * Getter for field name
  *

diff --git a/newscoop/library/Newscoop/Entity/Snippet/SnippetTemplate.php b/newscoop/library/Newscoop/Entity/Snippet/SnippetTemplate.php
@@ -179,6 +179,7 @@ public function getFields()
  */
  public function addField(SnippetTemplateField $field)
  {
+ $field->setTemplate($this);
  $this->fields->add($field);
 
  return $this;

diff --git a/newscoop/library/Newscoop/Entity/Snippet/SnippetTemplate/SnippetTemplateField.php b/newscoop/library/Newscoop/Entity/Snippet/SnippetTemplate/SnippetTemplateField.php
@@ -53,7 +53,7 @@ class SnippetTemplateField
 
  /**
  * @ORM\ManyToOne(targetEntity="Newscoop\Entity\Snippet\SnippetTemplate", inversedBy="fields")
- * @ORM\JoinColumn(name="TemplateId", referencedColumnName="Id")
+ * @ORM\JoinColumn(name="TemplateId", referencedColumnName="Id", nullable=false)
  * @var Newscoop\Entity\Snippet\SnippetTemplate
  */
  protected $template;
@@ -160,4 +160,28 @@ public function setScope($scope)
  return $this;
  }
 
+ /**
+ * Getter for template
+ *
+ * @return mixed
+ */
+ public function getTemplate()
+ {
+ return $this->template;
+ }
+
+ /**
+ * Setter for template
+ *
+ * @param mixed $template Value to set
+ *
+ * @return self
+ */
+ public function setTemplate($template)
+ {
+ $this->template = $template;
+
+ return $this;
+ }
+
 }