Browse Source

Evolution #649: Admin: user: password

Sevajol Bastien 12 years ago
parent
commit
072b248656

+ 4 - 50
src/Muzich/AdminBundle/Controller/Admin_user/EditController.php View File

4
 
4
 
5
 use Admingenerated\MuzichAdminBundle\BaseAdmin_userController\EditController as BaseEditController;
5
 use Admingenerated\MuzichAdminBundle\BaseAdmin_userController\EditController as BaseEditController;
6
 use Symfony\Component\HttpFoundation\RedirectResponse;
6
 use Symfony\Component\HttpFoundation\RedirectResponse;
7
+use Symfony\Component\Form\Form;
8
+use Muzich\CoreBundle\Entity\User;
7
 
9
 
8
 class EditController extends BaseEditController
10
 class EditController extends BaseEditController
9
 {
11
 {
10
-  
11
-  protected function getUserContext($pk)
12
+  public function preSave(Form $form, User $User)
12
   {
13
   {
13
-    $User = $this->getObject($pk);
14
-    if (!$User) {
15
-        throw new NotFoundHttpException("The Muzich\CoreBundle\Entity\User with id $pk can't be found");
16
-    }
17
-    return $User;
14
+    $this->container->get('fos_user.user_manager')->updateUser($User);
18
   }
15
   }
19
-  
20
-  protected function getFormPassword($User)
21
-  {
22
-    return $this->createFormBuilder($User)
23
-      ->add('plain_password', 'text')
24
-      ->getForm();
25
-  }
26
-  
27
-  public function passwordAction($pk)
28
-  {
29
-    $User = $this->getUserContext($pk);
30
-    $form = $this->getFormPassword($User);
31
-    
32
-    return $this->render('MuzichAdminBundle:Admin_userEdit:password.html.twig', array(
33
-        "User" => $User,
34
-        "form" => $form->createView(),
35
-    ));
36
-  }
37
-  
38
-  public function passwordUpdateAction($pk)
39
-  {
40
-    $User = $this->getUserContext($pk);
41
-    $form = $this->getFormPassword($User);
42
-    $form->bind($this->getRequest());
43
-    
44
-    if ($form->isValid())
45
-    {
46
-      $this->container->get('fos_user.user_manager')->updateUser($User);
47
-      $em = $this->getDoctrine()->getManager();
48
-      $em->persist($User);
49
-      $em->flush();
50
-      
51
-      $this->get('session')->setFlash('success', $this->get('translator')->trans("object.edit.success", array(), 'Admingenerator') );
52
-      return new RedirectResponse($this->generateUrl("Muzich_AdminBundle_Admin_user_list" ));
53
-    }
54
-    
55
-    $this->get('session')->setFlash('error',  $this->get('translator')->trans("object.edit.error", array(), 'Admingenerator') );
56
-    return $this->render('MuzichAdminBundle:Admin_userEdit:password.html.twig', array(
57
-        "User" => $User,
58
-        "form" => $form->createView(),
59
-    ));
60
-  }
61
-  
62
 }
16
 }

+ 0 - 3
src/Muzich/AdminBundle/Controller/Admin_user/NewController.php View File

8
 
8
 
9
 class NewController extends BaseNewController
9
 class NewController extends BaseNewController
10
 {
10
 {
11
-  
12
   public function preSave(Form $form, User $User)
11
   public function preSave(Form $form, User $User)
13
   {
12
   {
14
-    $User->setPlainPassword('k?F69*Cmh35nnK63~%KVDc^');
15
     $this->container->get('fos_user.user_manager')->updateUser($User);
13
     $this->container->get('fos_user.user_manager')->updateUser($User);
16
   }
14
   }
17
-  
18
 }
15
 }

+ 6 - 4
src/Muzich/AdminBundle/Resources/config/Admin_user-generator.yml View File

3
   model: Muzich\CoreBundle\Entity\User
3
   model: Muzich\CoreBundle\Entity\User
4
   namespace_prefix: Muzich
4
   namespace_prefix: Muzich
5
   bundle_name: AdminBundle
5
   bundle_name: AdminBundle
6
+  fields:
7
+    plain_password:
8
+      formType: text
9
+      dbType: text
6
 
10
 
7
 builders:
11
 builders:
8
   list:
12
   list:
13
         new: ~
17
         new: ~
14
       object_actions:
18
       object_actions:
15
         show: ~
19
         show: ~
16
-        password:
17
-          route: Muzich_AdminBundle_Admin_user_password
18
         edit: ~
20
         edit: ~
19
         delete: ~
21
         delete: ~
20
   filters:
22
   filters:
24
     params:
26
     params:
25
       title: New User
27
       title: New User
26
       display:
28
       display:
27
-        "General": [ username, email, town, country ]
29
+        "General": [ username, plain_password, email, town, country ]
28
         "Resettings": [ email_requested, email_requested_datetime ]
30
         "Resettings": [ email_requested, email_requested_datetime ]
29
         "Moderation": [ bad_report_count, moderated_element_count, moderated_tag_count, moderated_comment_count ]
31
         "Moderation": [ bad_report_count, moderated_element_count, moderated_tag_count, moderated_comment_count ]
30
         "System": [ cgu_accepted, mail_newsletter, mail_partner, enabled ]
32
         "System": [ cgu_accepted, mail_newsletter, mail_partner, enabled ]
35
     params:
37
     params:
36
       title: "You're editing the object \"%object%\"|{ %object%: User.username }|"
38
       title: "You're editing the object \"%object%\"|{ %object%: User.username }|"
37
       display: 
39
       display: 
38
-        "General": [ username, email, town, country ]
40
+        "General": [ username, plain_password, email, town, country ]
39
         "Resettings": [ email_requested, email_requested_datetime ]
41
         "Resettings": [ email_requested, email_requested_datetime ]
40
         "Moderation": [ bad_report_count, moderated_element_count, moderated_tag_count, moderated_comment_count ]
42
         "Moderation": [ bad_report_count, moderated_element_count, moderated_tag_count, moderated_comment_count ]
41
         "System": [ cgu_accepted, mail_newsletter, mail_partner, enabled ]
43
         "System": [ cgu_accepted, mail_newsletter, mail_partner, enabled ]

+ 0 - 12
src/Muzich/AdminBundle/Resources/config/routing.yml View File

1
-Muzich_AdminBundle_Admin_user_password:
2
-  pattern:  /Admin_user/{pk}/password
3
-  defaults: { _controller:Muzich\AdminBundle\Controller\Admin_user\EditController::passwordAction }
4
-  requirements:
5
-    _method:  GET
6
-
7
-Muzich_AdminBundle_Admin_user_password_update:
8
-  pattern:  /Admin_user/{pk}/password/update
9
-  defaults: { _controller:Muzich\AdminBundle\Controller\Admin_user\EditController::passwordUpdateAction }
10
-  requirements:
11
-    _method:  POST
12
-
13
 Muzich_AdminBundle_Admin_element_regenerate:
1
 Muzich_AdminBundle_Admin_element_regenerate:
14
   pattern:  /Admin_element/{pk}/regenerate
2
   pattern:  /Admin_element/{pk}/regenerate
15
   defaults: { _controller:Muzich\AdminBundle\Controller\Admin_element\EditController::regenerateAction }
3
   defaults: { _controller:Muzich\AdminBundle\Controller\Admin_element\EditController::regenerateAction }