diff --git a/Form/Type/CrudType.php b/Form/Type/CrudType.php index 6da8906..682db3e 100644 --- a/Form/Type/CrudType.php +++ b/Form/Type/CrudType.php @@ -2,8 +2,6 @@ namespace Opifer\CrudBundle\Form\Type; -use Genemu\Bundle\FormBundle\Form\JQuery\Type\Select2Type; - use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\DependencyInjection\ContainerInterface; @@ -95,8 +93,8 @@ public function buildForm(FormBuilderInterface $builder, array $options) ]); } elseif ($relation['targetEntity'] == $this->valuesetClass) { $builder->add($relation['fieldName'], 'opifer_valueset'); - }else { - $builder->add($relation['fieldName'], new Select2Type('entity'), [ + } else { + $builder->add($relation['fieldName'], 'entity', [ 'class' => $relation['targetEntity'], 'property' => 'name', 'empty_value' => '(empty)', diff --git a/README.md b/README.md index e2af09d..64706f7 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,6 @@ public function registerBundles() $bundles = array( ... new Braincrafted\Bundle\BootstrapBundle\BraincraftedBootstrapBundle(), - new Genemu\Bundle\FormBundle\GenemuFormBundle(), new JMS\SerializerBundle\JMSSerializerBundle(), new Liuggio\ExcelBundle\LiuggioExcelBundle(), new Opifer\CrudBundle\OpiferCrudBundle(), diff --git a/Transformer/DoctrineTypeTransformer.php b/Transformer/DoctrineTypeTransformer.php index f5c7a9f..47ce0a1 100644 --- a/Transformer/DoctrineTypeTransformer.php +++ b/Transformer/DoctrineTypeTransformer.php @@ -26,9 +26,11 @@ public function transform($type) case 'float': return 'number'; case 'date': + return 'date'; case 'datetime': + return 'datetime'; case 'time': - return 'genemu_jquerydate'; + return 'time'; case 'array': case 'simple_array': case 'json_array': diff --git a/composer.json b/composer.json index deb9348..0d62127 100644 --- a/composer.json +++ b/composer.json @@ -19,12 +19,10 @@ "sensio/framework-extra-bundle": "~3.0", "gedmo/doctrine-extensions": "~2.3", - "genemu/form-bundle": "~2.2", "jms/serializer-bundle": "~1.0", "pagerfanta/pagerfanta": "~1.0.3", "willdurand/js-translation-bundle": "2.2.1", "liuggio/excelbundle": "^2.0", - "opifer/rulesengine-bundle": "@dev", "opifer/rulesengine": "@dev" },