Evolution #649: Admin: user: password

src/Muzich/AdminBundle/Controller/Admin_user/EditController.php

@@ -4,59 +4,13 @@ namespace Muzich\AdminBundle\Controller\Admin_user;
 
 use Admingenerated\MuzichAdminBundle\BaseAdmin_userController\EditController as BaseEditController;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\Form\Form;
+use Muzich\CoreBundle\Entity\User;
 
 class EditController extends BaseEditController
 {
-  
-  protected function getUserContext($pk)
+  public function preSave(Form $form, User $User)
   {
-    $User = $this->getObject($pk);
-    if (!$User) {
-        throw new NotFoundHttpException("The Muzich\CoreBundle\Entity\User with id $pk can't be found");
-    }
-    return $User;
+    $this->container->get('fos_user.user_manager')->updateUser($User);
   }
-  
-  protected function getFormPassword($User)
-  {
-    return $this->createFormBuilder($User)
-      ->add('plain_password', 'text')
-      ->getForm();
-  }
-  
-  public function passwordAction($pk)
-  {
-    $User = $this->getUserContext($pk);
-    $form = $this->getFormPassword($User);
-    
-    return $this->render('MuzichAdminBundle:Admin_userEdit:password.html.twig', array(
-        "User" => $User,
-        "form" => $form->createView(),
-    ));
-  }
-  
-  public function passwordUpdateAction($pk)
-  {
-    $User = $this->getUserContext($pk);
-    $form = $this->getFormPassword($User);
-    $form->bind($this->getRequest());
-    
-    if ($form->isValid())
-    {
-      $this->container->get('fos_user.user_manager')->updateUser($User);
-      $em = $this->getDoctrine()->getManager();
-      $em->persist($User);
-      $em->flush();
-      
-      $this->get('session')->setFlash('success', $this->get('translator')->trans("object.edit.success", array(), 'Admingenerator') );
-      return new RedirectResponse($this->generateUrl("Muzich_AdminBundle_Admin_user_list" ));
-    }
-    
-    $this->get('session')->setFlash('error',  $this->get('translator')->trans("object.edit.error", array(), 'Admingenerator') );
-    return $this->render('MuzichAdminBundle:Admin_userEdit:password.html.twig', array(
-        "User" => $User,
-        "form" => $form->createView(),
-    ));
-  }
-  
 }

src/Muzich/AdminBundle/Controller/Admin_user/NewController.php

@@ -8,11 +8,8 @@ use Muzich\CoreBundle\Entity\User;
 
 class NewController extends BaseNewController
 {
-  
   public function preSave(Form $form, User $User)
   {
-    $User->setPlainPassword('k?F69*Cmh35nnK63~%KVDc^');
     $this->container->get('fos_user.user_manager')->updateUser($User);
   }
-  
 }

src/Muzich/AdminBundle/Resources/config/Admin_user-generator.yml

@@ -3,6 +3,10 @@ params:
   model: Muzich\CoreBundle\Entity\User
   namespace_prefix: Muzich
   bundle_name: AdminBundle
+  fields:
+    plain_password:
+      formType: text
+      dbType: text
 
 builders:
   list:
@@ -13,8 +17,6 @@ builders:
         new: ~
       object_actions:
         show: ~
-        password:
-          route: Muzich_AdminBundle_Admin_user_password
         edit: ~
         delete: ~
   filters:
@@ -24,7 +26,7 @@ builders:
     params:
       title: New User
       display:
-        "General": [ username, email, town, country ]
+        "General": [ username, plain_password, email, town, country ]
         "Resettings": [ email_requested, email_requested_datetime ]
         "Moderation": [ bad_report_count, moderated_element_count, moderated_tag_count, moderated_comment_count ]
         "System": [ cgu_accepted, mail_newsletter, mail_partner, enabled ]
@@ -35,7 +37,7 @@ builders:
     params:
       title: "You're editing the object \"%object%\"|{ %object%: User.username }|"
       display: 
-        "General": [ username, email, town, country ]
+        "General": [ username, plain_password, email, town, country ]
         "Resettings": [ email_requested, email_requested_datetime ]
         "Moderation": [ bad_report_count, moderated_element_count, moderated_tag_count, moderated_comment_count ]
         "System": [ cgu_accepted, mail_newsletter, mail_partner, enabled ]

src/Muzich/AdminBundle/Resources/config/routing.yml

@@ -1,15 +1,3 @@
-Muzich_AdminBundle_Admin_user_password:
-  pattern:  /Admin_user/{pk}/password
-  defaults: { _controller:Muzich\AdminBundle\Controller\Admin_user\EditController::passwordAction }
-  requirements:
-    _method:  GET
-
-Muzich_AdminBundle_Admin_user_password_update:
-  pattern:  /Admin_user/{pk}/password/update
-  defaults: { _controller:Muzich\AdminBundle\Controller\Admin_user\EditController::passwordUpdateAction }
-  requirements:
-    _method:  POST
-
 Muzich_AdminBundle_Admin_element_regenerate:
   pattern:  /Admin_element/{pk}/regenerate
   defaults: { _controller:Muzich\AdminBundle\Controller\Admin_element\EditController::regenerateAction }