Merge pull request #63 from rvanlaarhoven/deprecations

QueryValue and Attribute changes

Author: rvanlaarhoven

Entity/QueryValue.php

@@ -4,6 +4,7 @@
 
 use Doctrine\ORM\EntityRepository;
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -36,7 +37,6 @@ public function __construct(OptionType $optionType, $attributeClass, $templateCl
         $this->templateClass  = $templateClass;
     }
 
-
     /**
      * {@inheritDoc}
      */
@@ -74,6 +74,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'label' => 'attribute.sort',
             'attr'  => [ 'help_text' => 'form.sort.help_text', 'widget_col' => 2 ],
             'empty_data' => 0
+        ])->add('required', ChoiceType::class, [
+            'choices' => [
+                false => 'Not required',
+                true => 'Required'
+            ],
+            'label' => 'Required',
+            'required' => true
         ]);
 
         $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {

Form/Type/AttributeType.php

@@ -20,7 +20,7 @@ class TemplateType extends AbstractType
      * @param AttributeType $attributeType
      * @param string        $templateClass
      */
-    public function __construct( AttributeType $attributeType, $templateClass)
+    public function __construct(AttributeType $attributeType, $templateClass)
     {
         $this->attributeType = $attributeType;
         $this->templateClass = $templateClass;

Form/Type/TemplateType.php

@@ -16,7 +16,6 @@
  */
 class Attribute implements AttributeInterface
 {
-
     /**
      * @var integer
      *
@@ -99,6 +98,13 @@ class Attribute implements AttributeInterface
      **/
     protected $allowedTemplates;
 
+    /**
+     * @var boolean
+     *
+     * @ORM\Column(name="required", type="boolean")
+     */
+    protected $required = false;
+
     /**
      * @var array
      *
@@ -449,6 +455,24 @@ public function setAllowedTemplates(ArrayCollection $allowedTemplates)
         return $this;
     }
 
+    /**
+     * @return boolean
+     */
+    public function getRequired()
+    {
+        return $this->required;
+    }
+
+    /**
+     * @param boolean $required
+     */
+    public function setRequired($required)
+    {
+        $this->required = $required;
+
+        return $this;
+    }
+
     /**
      * Set parameters
      *

Model/Attribute.php

@@ -5,7 +5,6 @@ parameters:
     opifer.eav.integer_value_provider.class: Opifer\EavBundle\ValueProvider\IntegerValueProvider
     opifer.eav.media_value_provider.class: Opifer\EavBundle\ValueProvider\MediaValueProvider
     opifer.eav.nested_value_provider.class: Opifer\EavBundle\ValueProvider\NestedValueProvider
-    opifer.eav.query_value_provider.class: Opifer\EavBundle\ValueProvider\QueryValueProvider
     opifer.eav.select_value_provider.class: Opifer\EavBundle\ValueProvider\SelectValueProvider
     opifer.eav.string_value_provider.class: Opifer\EavBundle\ValueProvider\StringValueProvider
     opifer.eav.text_value_provider.class: Opifer\EavBundle\ValueProvider\TextValueProvider
@@ -55,11 +54,6 @@ services:
         tags:
             - { name: opifer.eav.value_provider, alias: nested }
 
-    opifer.eav.query_value_provider:
-        class: %opifer.eav.query_value_provider.class%
-        tags:
-            - { name: opifer.eav.value_provider, alias: query }
-
     opifer.eav.string_value_provider:
         class: %opifer.eav.string_value_provider.class%
         tags:

Resources/config/providers.yml

@@ -79,8 +79,8 @@ angular.module('OpiferNestedContent', ['ui.sortable'])
                 '           <div class="title" ng-click="toggle()">'+
                 '               <div class="cell-icon cell-columns" ng-if="!subject.data.coverImage"></div>'+
                 '               <div style="background-image: url({{ subject.data.coverImage }});" ng-if="subject.data.coverImage" class="content-cover"></div>'+
+                '               <span class="template form-control-static"><span class="label label-info">{{ subject.data.templateDisplayName }}</span></span>'+
                 '           </div>'+
-                '           <span class="template form-control-static"><span class="label label-info">{{ subject.data.templateDisplayName }}</span></span>'+
                 '       </div>'+
                 '       <div class="col-xs-12 col-sm-3 col-lg-2">'+
                 '           <div class="pull-right">'+

Resources/public/app/nestedcontent/nestedcontent.js

@@ -24,8 +24,3 @@
         {{ form_end(form) }}
     </article>
 {% endblock opifer_eav_body %}
-
-{% block javascripts %}
-    {{ parent() }}
-    {{ form_javascript(form) }}
-{% endblock %}

Resources/views/Template/edit.html.twig

@@ -15,7 +15,7 @@ class BooleanValueProvider extends AbstractValueProvider implements ValueProvide
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->add('value', 'checkbox', [
-            'required' => (isset($options['attribute']->getParameters()['required'])) ? $options['attribute']->getParameters()['required'] : false,
+            'required' => ($options['attribute']->getRequired()) ? true : false,
         ]);
     }
 

Tests/ValueProvider/QueryValueProviderTest.php

@@ -27,7 +27,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $attributeId = $options['attribute']->getId();
         $builder->add('options', 'entity', [
-            'required'      => (isset($options['attribute']->getParameters()['required'])) ? $options['attribute']->getParameters()['required'] : false,
+            'required'      => ($options['attribute']->getRequired()) ? true : false,
             'label'         => $options['attribute']->getDisplayName(),
             'multiple'      => true,   // Multiple selection allowed
             'expanded'      => true,   // Render as checkboxes