From 6b853750e59eacbb13ab3ef7ed403be4702e701c Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 1 Apr 2015 16:34:02 -0700 Subject: [PATCH 1/2] Fix for strict mode app install --- app/commands/AppCommand.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/commands/AppCommand.php b/app/commands/AppCommand.php index 57a08e9890..52e3dd524c 100755 --- a/app/commands/AppCommand.php +++ b/app/commands/AppCommand.php @@ -318,6 +318,7 @@ class AppCommand extends Command $data = array_merge($this->userData, array( 'activated' => 1, 'manager_id' => NULL, + 'notes' => 'Generated on install', 'permissions' => array( 'admin' => 1, 'user' => 1, From e4b45231ecfa34b4f504db42f3f18c4440f0085a Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 1 Apr 2015 17:22:48 -0700 Subject: [PATCH 2/2] Fix for bad seed data if Jon Doe doesn't get created --- app/config/version.php | 4 ++-- app/database/seeds/ActionlogSeeder.php | 6 +++--- app/database/seeds/LicenseSeatsSeeder.php | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/config/version.php b/app/config/version.php index 177395f244..87d12b4a82 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v1.2.6.1-166', - 'hash_version' => 'v1.2.6.1-166-g51148f1', + 'app_version' => 'v1.2.6.1-179', + 'hash_version' => 'v1.2.6.1-179-gb53847c', ); \ No newline at end of file diff --git a/app/database/seeds/ActionlogSeeder.php b/app/database/seeds/ActionlogSeeder.php index 9f719e01e1..dbcf808c12 100755 --- a/app/database/seeds/ActionlogSeeder.php +++ b/app/database/seeds/ActionlogSeeder.php @@ -15,7 +15,7 @@ class ActionlogSeeder extends Seeder 'user_id' => '1', 'action_type' => 'checkout', 'asset_id' => '1', - 'checkedout_to' => '2', + 'checkedout_to' => '1', 'location_id' => '3', 'created_at' => $date->modify('-10 day'), 'asset_type' => 'hardware', @@ -28,7 +28,7 @@ class ActionlogSeeder extends Seeder 'user_id' => '1', 'action_type' => 'checkin from', 'asset_id' => '1', - 'checkedout_to' => '2', + 'checkedout_to' => '1', 'location_id' => NULL, 'created_at' => $date->modify('-10 day'), 'asset_type' => 'hardware', @@ -54,7 +54,7 @@ class ActionlogSeeder extends Seeder 'user_id' => '1', 'action_type' => 'checkin from', 'asset_id' => '1', - 'checkedout_to' => '2', + 'checkedout_to' => '1', 'location_id' => NULL, 'created_at' => $date->modify('-10 day'), 'asset_type' => 'software', diff --git a/app/database/seeds/LicenseSeatsSeeder.php b/app/database/seeds/LicenseSeatsSeeder.php index 2dab03494a..ba9e0c70a6 100755 --- a/app/database/seeds/LicenseSeatsSeeder.php +++ b/app/database/seeds/LicenseSeatsSeeder.php @@ -24,7 +24,7 @@ class LicenseSeatsSeeder extends Seeder $license_seats[] = array( 'license_id' => '1', - 'assigned_to' => '2', + 'assigned_to' => '1', 'created_at' => $date->modify('-10 day')->format('Y-m-d H:i:s'), 'updated_at' => $date->modify('-3 day')->format('Y-m-d H:i:s'), 'deleted_at' => NULL, @@ -35,7 +35,7 @@ class LicenseSeatsSeeder extends Seeder $license_seats[] = array( 'license_id' => '1', - 'assigned_to' => '2', + 'assigned_to' => '1', 'created_at' => $date->modify('-10 day')->format('Y-m-d H:i:s'), 'updated_at' => $date->modify('-3 day')->format('Y-m-d H:i:s'), 'deleted_at' => NULL, @@ -57,7 +57,7 @@ class LicenseSeatsSeeder extends Seeder $license_seats[] = array( 'license_id' => '1', - 'assigned_to' => '2', + 'assigned_to' => '1', 'created_at' => $date->modify('-10 day')->format('Y-m-d H:i:s'), 'updated_at' => $date->modify('-3 day')->format('Y-m-d H:i:s'), 'deleted_at' => NULL,