Create member from parent

[galette.git] / galette / lib / Galette / Controllers / Crud / MembersController.php

diff --git a/galette/lib/Galette/Controllers/Crud/MembersController.php b/galette/lib/Galette/Controllers/Crud/MembersController.php
index 998c7b65915f68537b1ce7a7ae0b7f385aae9968..50d1c084023414e3ebf25ed5aa048857e025fc08 100644 (file)
--- a/galette/lib/Galette/Controllers/Crud/MembersController.php
+++ b/galette/lib/Galette/Controllers/Crud/MembersController.php
@@ -95,6 +95,19 @@ class MembersController extends CrudController
         return $this->edit($request, $response, null, 'add');
     }
 
+    /**
+     * Add child page
+     *
+     * @param Request  $request  PSR Request
+     * @param Response $response PSR Response
+     *
+     * @return Response
+     */
+    public function addChild(Request $request, Response $response): Response
+    {
+        return $this->edit($request, $response, null, 'addchild');
+    }
+
     /**
      * Self subscription page
      *
@@ -1083,29 +1096,41 @@ class MembersController extends CrudController
             //retrieve from session, in add or edit
             $member = $this->session->member;
             $this->session->member = null;
-        } elseif ($id !== null) {
+            $id = $member->id;
+        }
+
+        if ($id !== null) {
             //load requested member
             $member->load($id);
-            if (!$member->canEdit($this->login)) {
-                $this->flash->addMessage(
-                    'error_detected',
-                    _T("You do not have permission for requested URL.")
+            $can = $member->canEdit($this->login);
+        } else {
+            $can = $member->canCreate($this->login);
+        }
+
+        if (!$can) {
+            $this->flash->addMessage(
+                'error_detected',
+                _T("You do not have permission for requested URL.")
+            );
+
+            return $response
+                ->withStatus(403)
+                ->withHeader(
+                    'Location',
+                    $this->router->pathFor('me')
                 );
+        }
 
-                return $response
-                    ->withStatus(403)
-                    ->withHeader(
-                        'Location',
-                        $this->router->pathFor('me')
-                    );
-            }
+        //if adding a child, force parent here
+        if ($action === 'addchild') {
+            $member->setParent((int)$this->login->id);
         }
 
         // flagging required fields
         $fc = $this->fields_config;
 
         // password required if we create a new member
-        if ($member->id != '') {
+        if ($id === null) {
             $fc->setNotRequired('mdp_adh');
         }
 
@@ -1144,18 +1169,18 @@ class MembersController extends CrudController
 
         $form_elements = $fc->getFormElements(
             $this->login,
-            $member->id == ''
+            $id === null
         );
 
         // members
         $m = new Members();
-        $id = null;
+        $pid = null;
         if ($member->hasParent()) {
-            $id = ($member->parent instanceof Adherent ? $member->parent->id : $member->parent);
+            $pid = ($member->parent instanceof Adherent ? $member->parent->id : $member->parent);
         }
         $members = $m->getSelectizedMembers(
             $this->zdb,
-            $id
+            $pid
         );
 
         $route_params['members'] = [
@@ -1184,7 +1209,8 @@ class MembersController extends CrudController
                 'groups'            => $groups_list,
                 'fieldsets'         => $form_elements['fieldsets'],
                 'hidden_elements'   => $form_elements['hiddens'],
-                'parent_fields'     => $tpl_parent_fields
+                'parent_fields'     => $tpl_parent_fields,
+                'addchild'          => ($action === 'addchild')
             ) + $route_params
         );
         return $response;