From 0d8a810259177dc3f8153330eefb17b26fd2f440 Mon Sep 17 00:00:00 2001 From: REJack Date: Mon, 3 Dec 2018 14:10:51 +0100 Subject: [PATCH] updated Controllers/Admin/Migrate & renamed/updated created_default_users --- application/Controllers/Admin/Migrate.php | 2 +- ...> 20181031072914_create_default_users.php} | 21 ++++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) rename application/Database/Migrations/{20181031072914_create_default_admin.php => 20181031072914_create_default_users.php} (71%) diff --git a/application/Controllers/Admin/Migrate.php b/application/Controllers/Admin/Migrate.php index d0e2365..877afbd 100644 --- a/application/Controllers/Admin/Migrate.php +++ b/application/Controllers/Admin/Migrate.php @@ -47,7 +47,7 @@ class Migrate extends Controller } echo view('Templates/Header'); - echo view('Admin/Migrate', ['migrated' => $migrated]); + echo view('Admin/Migrate'); echo view('Templates/Footer'); } } diff --git a/application/Database/Migrations/20181031072914_create_default_admin.php b/application/Database/Migrations/20181031072914_create_default_users.php similarity index 71% rename from application/Database/Migrations/20181031072914_create_default_admin.php rename to application/Database/Migrations/20181031072914_create_default_users.php index 8dab128..6c89dfa 100644 --- a/application/Database/Migrations/20181031072914_create_default_admin.php +++ b/application/Database/Migrations/20181031072914_create_default_users.php @@ -27,7 +27,7 @@ use Config\Aauth as AauthConfig; * * @codeCoverageIgnore */ -class Migration_create_default_admin extends Migration +class Migration_create_default_users extends Migration { /** * Create Table @@ -38,12 +38,19 @@ class Migration_create_default_admin extends Migration { $config = new AauthConfig(); $data = [ - 'username' => 'admin', - 'email' => 'admin@example.com', - 'password' => password_hash('password123456', $config->passwordHashAlgo, $config->passwordHashOptions), + [ + 'username' => 'admin', + 'email' => 'admin@example.com', + 'password' => password_hash('password123456', $config->passwordHashAlgo, $config->passwordHashOptions), + ], + [ + 'username' => 'user', + 'email' => 'user@example.com', + 'password' => password_hash('password123456', $config->passwordHashAlgo, $config->passwordHashOptions), + ], ]; - $this->db->table($config->dbTableUsers)->insert($data); + $this->db->table($config->dbTableUsers)->insertBatch($data); $data = [ [ @@ -54,6 +61,10 @@ class Migration_create_default_admin extends Migration 'group_id' => 2, 'user_id' => 1, ], + [ + 'group_id' => 2, + 'user_id' => 2, + ], ]; $this->db->table($config->dbTableGroupToUser)->insertBatch($data);