Presentation user now has empty value as option, users in select opti…

…ons are now sortable
ezpublishlegacy · Jul 31, 2015 · bc036b8 · bc036b8
1 parent b161fab
commit bc036b8
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 12 deletions.
diff --git a/Controller/PresentationAdminController.php b/Controller/PresentationAdminController.php
@@ -67,7 +67,7 @@ public function createAction(Request $request, $event_id)
         if ($form->isValid()) {
             $entity->presenterName = $form->getData()['presenterName'];
             $entity->presenterSurname = $form->getData()['presenterSurname'];
-            $entity->setUserId($form->getData()['user']->getId());
+            $entity->setUserId($form->getData()['user_id']->getId());
             $this->get('live_voting.doctrine_presentation_repo')->save($entity);
 
             if($form->getData()['presentationRecord']->getImageUrl())
@@ -97,10 +97,17 @@ private function createCreateForm(PresentationRecord $entity){
             ->add('presentationRecord', new PresentationType(), array('data'=>$entity))
             ->add('presenterName')
             ->add('presenterSurname')
-            ->add('user', 'entity', array(
-                  'class' => 'LiveVotingBundle:User',
-                  'property' => 'email',
-                ))
+            ->add('user_id', 'entity', array(
+              'attr' => array('class' => 'form-control'),
+              'label' => "Presenter",
+              'query_builder' => function(EntityRepository $repository) {
+                  return $repository->createQueryBuilder('u')->orderBy('u.email', 'ASC');
+              },
+              'class' => 'LiveVotingBundle:User',
+              'property' => 'email',
+              'required'    => false,
+              'empty_value' => '(Select user)',
+              'empty_data' => null))
             ->add('submit', 'submit', array('label' => 'Create'))
             ->setMethod('POST')
             ->setAction($this->generateUrl('admin_presentation_create', array('event_id'=>$entity->getEventId())));

diff --git a/Form/EventType.php b/Form/EventType.php
@@ -32,6 +32,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ))
             ->add('image', 'file', array(
                 'data_class' => null,
+                'label' => "Event image",
                 'required' => false,
                 'attr' => array('class'=> 'filestyle')
             ))

diff --git a/Form/PresentationType.php b/Form/PresentationType.php
@@ -2,6 +2,7 @@
 
 namespace Netgen\LiveVotingBundle\Form;
 
+use Doctrine\ORM\EntityRepository;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;

diff --git a/Form/RegistrationType.php b/Form/RegistrationType.php
@@ -2,6 +2,7 @@
 
 namespace Netgen\LiveVotingBundle\Form;
 
+use Doctrine\ORM\EntityRepository;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
@@ -22,8 +23,17 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('arrivalTime')
             ->add('departureTime')
             ->add('event', null ,array('label'=>'Master Event'))
-            ->add('user')
-        ;
+            ->add('user', 'entity', array(
+                'attr' => array('class' => 'form-control'),
+                'label' => "User",
+                'query_builder' => function(EntityRepository $repository) {
+                    return $repository->createQueryBuilder('u')->orderBy('u.email', 'ASC');
+                },
+                'class' => 'LiveVotingBundle:User',
+                'property' => 'email',
+                'required'    => false,
+                'empty_value' => '(Select user)',
+                'empty_data' => null));
     }
 
     /**

diff --git a/Resources/views/Presentation/new.html.twig b/Resources/views/Presentation/new.html.twig
@@ -18,11 +18,6 @@
             <div class="form-group">
                 {{ form_widget(form.presentationRecord) }}
             </div>
-
-            <div class="form-group">
-                {{ form_label(form.user) }}
-                {{ form_widget(form.user) }}
-            </div>
             {{ form_end(form) }}
         </div>
     </div>