Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .env.testing-performance
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ MAIL_TLS_VERIFY_PEER=true
# --------------------------------------------
IMAGE_LIB=gd


# --------------------------------------------
# OPTIONAL: BACKUP SETTINGS
# --------------------------------------------
Expand Down
67 changes: 67 additions & 0 deletions PredefinedFilter::truncate();
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
= [
[
"id" => 1,
"name" => "Asset Tag UI Copy",
],
[
"id" => 2,
"name" => "Test Name Filter",
],
[
"id" => 3,
"name" => "Asset TAG Like 123",
],
[
"id" => 4,
"name" => "Model filter",
],
[
"id" => 5,
"name" => "Serial filter",
],
[
"id" => 6,
"name" => "Status filter",
],
[
"id" => 7,
"name" => "Supplier filter",
],
[
"id" => 8,
"name" => "Company filter",
],
[
"id" => 9,
"name" => "RTD-Location filter",
],
[
"id" => 10,
"name" => "Custom Field Ram",
],
[
"id" => 11,
"name" => "Purchased Between",
],
[
"id" => 12,
"name" => "Combo contains: Model AND CustomField_RAM",
],
[
"id" => 13,
"name" => "Combo contains: Model AND Manufacturer",
],
[
"id" => 14,
"name" => "Combo contains: Model NOT Manufacturer",
],
[
"id" => 15,
"name" => "Assigned To Location contains name",
],
[
"id" => 16,
"name" => "ShouldNotBeVisibleForUserFilter",
],
]

Empty file.
16 changes: 10 additions & 6 deletions database/seeders/DatabaseSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ public function run()
{
Model::unguard();

// Only create default settings if they do not exist in the db.
if (! Setting::first()) {
// factory(Setting::class)->create();
$this->call(SettingsSeeder::class);
}

Expand All @@ -39,16 +37,22 @@ public function run()
$this->call(DepreciationSeeder::class);
$this->call(StatuslabelSeeder::class);
$this->call(AccessorySeeder::class);
$this->call(CustomFieldSeeder::class);

$dataset = env('TEST_DATASET', 'default');

if ($dataset === 'huge+custom') {
$this->call(CustomFieldsStandaloneSeeder::class);
} else {
$this->call(CustomFieldSeeder::class);
}

$this->call(AssetSeeder::class);
$this->call(LicenseSeeder::class);
$this->call(ComponentSeeder::class);
$this->call(ConsumableSeeder::class);
$this->call(ActionlogSeeder::class);
$this->call(PredefinedFilterSeeder::class);
$this->call(PredefinedFilterPermissionSeeder::class);
$this->call(CustomFieldsStandaloneSeeder::class);


Artisan::call('snipeit:sync-asset-locations', ['--output' => 'all']);
$output = Artisan::output();
Expand All @@ -60,4 +64,4 @@ public function run()
DB::table('maintenances')->truncate();
DB::table('requested_assets')->truncate();
}
}
}
Loading