Merge branch 'master' of https://github.com/netgen/LiveVotingBundle

ezpublishlegacy · Jul 30, 2015 · 500abaf · 500abaf
2 parents cbb1d88 + 0dc255f
commit 500abaf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/Form/PresentationType.php b/Form/PresentationType.php
@@ -25,7 +25,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('hall', 'text' ,array('attr' => array('class' => 'form-control')))
             ->add('begin', 'datetime')
             ->add('end', 'datetime')
-            ->add('joind_in_id', 'text', array('attr' => array('class' => 'form-control', 'required' => false)))
+            ->add('joind_in_id', 'text', array('attr' => array('class' => 'form-control'), 'required' => false))
             //->add('event', 'entity', array('class'=>'Netgen\LiveVotingBundle\Entity\Event', 'disabled'=>true))
         ;
     }

diff --git a/Resources/public/js/script.js b/Resources/public/js/script.js
@@ -29,7 +29,7 @@ function brain(options_){
     $('body').on('change', '.vote-form', function(e){e.preventDefault();});
 
 
-    $('body').on('click', '.vote-form input', function(e){
+    $('body').on('click', '.vote-form button', function(e){
         e.preventDefault();
         if(!canIVote)return;
         var action = $(this).closest("form").attr('action');
@@ -230,6 +230,13 @@ function brain(options_){
                     $(this).removeClass('active');
                 }
             });
+            this.element.find('button').each(function(){
+                if(this.value == vote_number){
+                    $(this).addClass('active');
+                }else{
+                    $(this).removeClass('active');
+                }
+            });
         };
 
 

diff --git a/Service/PresentationService/Impl/DoctrinePresentationRepo.php b/Service/PresentationService/Impl/DoctrinePresentationRepo.php
@@ -104,8 +104,9 @@ public function find($find_criteria = array())
       }
 
         $presentationEntities = $this->em->getRepository($this->presentationRepository)->findBy($find_criteria);
-              if(!$presentationEntities)
-                throw new NotFoundHttpException('Presentation(s) not found.');
+
+        /*if(!$presentationEntities)
+            throw new NotFoundHttpException('Presentation(s) not found.');*/
 
         $presentationObjects = array();
         foreach ($presentationEntities as $pres) {