Browse Source

test fixs

Sevajol Bastien 12 years ago
parent
commit
68bbc176d4

+ 3 - 3
src/Muzich/CoreBundle/Tests/ElementFactory/ElementFactoryTest.php View File

116
       array($hardtek->getId(), $tribe->getId()), 
116
       array($hardtek->getId(), $tribe->getId()), 
117
       '<iframe frameborder="0" width="'.$this->getParam('dailymotion_player_width').'" '
117
       '<iframe frameborder="0" width="'.$this->getParam('dailymotion_player_width').'" '
118
         .'height="'.$this->getParam('dailymotion_player_height').'" '
118
         .'height="'.$this->getParam('dailymotion_player_height').'" '
119
-        .'src="http://www.dailymotion.com/embed/video/xafj1q"></iframe>'
119
+        .'src="http://www.dailymotion.com/embed/video/xafj1q?autoPlay=1"></iframe>'
120
     );
120
     );
121
     
121
     
122
     /*
122
     /*
259
       'http://www.deezer.com/fr/music/pantera/far-beyond-driven-80398', 
259
       'http://www.deezer.com/fr/music/pantera/far-beyond-driven-80398', 
260
       array($hardtek->getId(), $tribe->getId()), 
260
       array($hardtek->getId(), $tribe->getId()), 
261
       '<iframe scrolling="no" frameborder="0" allowTransparency="true" '
261
       '<iframe scrolling="no" frameborder="0" allowTransparency="true" '
262
-        .'src="http://www.deezer.com/fr/plugins/player?autoplay=false&playlist=true'
262
+        .'src="http://www.deezer.com/fr/plugins/player?autoplay=true&playlist=true'
263
         .'&width='.$this->getParam('deezer_player_width').'&height='
263
         .'&width='.$this->getParam('deezer_player_width').'&height='
264
         .$this->getParam('deezer_player_height')
264
         .$this->getParam('deezer_player_height')
265
         .'&cover=true&btn_popup=true&type=album&id=80398&title=" '
265
         .'&cover=true&btn_popup=true&type=album&id=80398&title=" '
274
       'http://www.deezer.com/fr/music/playlist/18701350', 
274
       'http://www.deezer.com/fr/music/playlist/18701350', 
275
       array($hardtek->getId(), $tribe->getId()), 
275
       array($hardtek->getId(), $tribe->getId()), 
276
       '<iframe scrolling="no" frameborder="0" allowTransparency="true" '
276
       '<iframe scrolling="no" frameborder="0" allowTransparency="true" '
277
-        .'src="http://www.deezer.com/fr/plugins/player?autoplay=false&playlist=true'
277
+        .'src="http://www.deezer.com/fr/plugins/player?autoplay=true&playlist=true'
278
         .'&width='.$this->getParam('deezer_player_width').'&height='
278
         .'&width='.$this->getParam('deezer_player_width').'&height='
279
         .$this->getParam('deezer_player_height')
279
         .$this->getParam('deezer_player_height')
280
         .'&cover=true&btn_popup=true&type=playlist&id=18701350&title=" '
280
         .'&cover=true&btn_popup=true&type=playlist&id=18701350&title=" '

+ 9 - 0
src/Muzich/CoreBundle/lib/Controller.php View File

10
 use Symfony\Component\HttpFoundation\Response;
10
 use Symfony\Component\HttpFoundation\Response;
11
 use Muzich\CoreBundle\Searcher\GlobalSearcher;
11
 use Muzich\CoreBundle\Searcher\GlobalSearcher;
12
 use Muzich\CoreBundle\Entity\Element;
12
 use Muzich\CoreBundle\Entity\Element;
13
+use Muzich\CoreBundle\Entity\Presubscription;
13
 
14
 
14
 class Controller extends BaseController
15
 class Controller extends BaseController
15
 {
16
 {
492
     return $groups;
493
     return $groups;
493
   }
494
   }
494
   
495
   
496
+  protected function getPreSubscriptionForm()
497
+  {
498
+    return $this->createFormBuilder(new Presubscription())
499
+      ->add('email', 'email')
500
+      ->getForm()
501
+    ;
502
+  }
503
+  
495
 }
504
 }

+ 0 - 9
src/Muzich/IndexBundle/Controller/IndexController.php View File

7
 use Symfony\Component\Security\Core\SecurityContext;
7
 use Symfony\Component\Security\Core\SecurityContext;
8
 use Symfony\Component\Validator\Constraints\Email;
8
 use Symfony\Component\Validator\Constraints\Email;
9
 use Symfony\Component\Validator\Constraints\Collection;
9
 use Symfony\Component\Validator\Constraints\Collection;
10
-use Muzich\CoreBundle\Entity\Presubscription;
11
 use Symfony\Component\HttpFoundation\Request;
10
 use Symfony\Component\HttpFoundation\Request;
12
 
11
 
13
 class IndexController extends Controller
12
 class IndexController extends Controller
35
     ));
34
     ));
36
   }
35
   }
37
   
36
   
38
-  protected function getPreSubscriptionForm()
39
-  {
40
-    return $this->createFormBuilder(new Presubscription())
41
-      ->add('email', 'email')
42
-      ->getForm()
43
-    ;
44
-  }
45
-  
46
   /**
37
   /**
47
    * Gestion du formulaire d'identification sur la page d'index.
38
    * Gestion du formulaire d'identification sur la page d'index.
48
    * 
39
    * 

+ 2 - 1
src/Muzich/UserBundle/Controller/UserController.php View File

215
         'registration_errors'      => $form->getErrors(),
215
         'registration_errors'      => $form->getErrors(),
216
         'registration_errors_pers' => $errors,
216
         'registration_errors_pers' => $errors,
217
         'last_username'            => null,
217
         'last_username'            => null,
218
-        'registration_page'        => true
218
+        'registration_page'        => true,
219
+        'presubscription_form'     => $this->getPreSubscriptionForm()->createView()
219
       )
220
       )
220
     );
221
     );
221
   }
222
   }