From b833c40f1b4388eb25b861f1fad68e3813cc1e90 Mon Sep 17 00:00:00 2001 From: Antonio Altieri Date: Thu, 10 Feb 2022 20:19:53 +0100 Subject: [PATCH 1/2] Activate admin user created during igniter:install by default (#921) * User activated by default * pass second parameter $activate Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> Co-authored-by: Antonio Altieri Co-authored-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> --- app/system/console/commands/IgniterInstall.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/system/console/commands/IgniterInstall.php b/app/system/console/commands/IgniterInstall.php index 6d64c470ed..88537837b0 100644 --- a/app/system/console/commands/IgniterInstall.php +++ b/app/system/console/commands/IgniterInstall.php @@ -187,7 +187,7 @@ protected function createSuperUser() 'super_user' => TRUE, 'groups' => [Staff_groups_model::first()->staff_group_id], 'locations' => [Locations_model::first()->location_id], - ]); + ], TRUE); $this->line('Admin user '.$user->username.' created!'); } From 1da4091b58b8fef9104dda02fe33c19a087de004 Mon Sep 17 00:00:00 2001 From: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> Date: Thu, 10 Feb 2022 20:31:02 +0000 Subject: [PATCH 2/2] Fix call to undefined method getConfigAttributes error Signed-off-by: Sam Poyigi <6567634+sampoyigi@users.noreply.github.com> --- app/admin/controllers/Payments.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/admin/controllers/Payments.php b/app/admin/controllers/Payments.php index d9a1ba803a..ba3ba77477 100644 --- a/app/admin/controllers/Payments.php +++ b/app/admin/controllers/Payments.php @@ -166,7 +166,7 @@ public function formValidate($model, $form) if ($mergeRules = $form->model->getConfigRules()) array_push($rules, ...$mergeRules); - if ($mergeAttributes = $form->model->getConfigAttributes()) + if ($mergeAttributes = $form->model->getConfigValidationAttributes()) array_push($attributes, ...$mergeAttributes); }