lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix validation for component groups

Browse Source
This commit is contained in:
James Brooks
2017-02-27 19:47:44 +00:00
parent e156be6ce1
commit 2c1700f4da
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Bus/Commands/ComponentGroup/AddComponentGroupCommand.php
View File

@@ -54,7 +54,7 @@ final class AddComponentGroupCommand
public $rules = [ public $rules = [
'name' => 'required|string', 'name' => 'required|string',
'order' => 'required|int', 'order' => 'required|int',
'collapsed' => 'required|int|between:0,3', 'collapsed' => 'required|int|between:0,4',
'visible' => 'required|bool', 'visible' => 'required|bool',
]; ];

2
app/Bus/Commands/ComponentGroup/UpdateComponentGroupCommand.php
View File

@@ -63,7 +63,7 @@ final class UpdateComponentGroupCommand
public $rules = [ public $rules = [
'name' => 'nullable|string', 'name' => 'nullable|string',
'order' => 'nullable|int', 'order' => 'nullable|int',
'collapsed' => 'nullable|int|between:0,3', 'collapsed' => 'nullable|int|between:0,4',
'visible' => 'nullable|bool', 'visible' => 'nullable|bool',
]; ];

4
app/Models/ComponentGroup.php
View File

@@ -81,8 +81,8 @@ class ComponentGroup extends Model implements HasPresenter
public $rules = [ public $rules = [
'name' => 'required|string', 'name' => 'required|string',
'order' => 'required|int', 'order' => 'required|int',
'collapsed' => 'required|int', 'collapsed' => 'required|int|between:0,4',
'visible' => 'required|int', 'visible' => 'required|bool',
]; ];
/** /**

10
database/factories/ModelFactory.php
View File

@@ -28,7 +28,7 @@ $factory->define(Component::class, function ($faker) {
'name' => $faker->sentence(), 'name' => $faker->sentence(),
'description' => $faker->paragraph(), 'description' => $faker->paragraph(),
'link' => $faker->url(), 'link' => $faker->url(),
'status' => random_int(1, 4), 'status' => mt_rand(1, 4),
'order' => 0, 'order' => 0,
]; ];
}); });
@@ -37,7 +37,7 @@ $factory->define(ComponentGroup::class, function ($faker) {
return [ return [
'name' => $faker->words(2, true), 'name' => $faker->words(2, true),
'order' => 0, 'order' => 0,
'collapsed' => random_int(0, 3), 'collapsed' => mt_rand(0, 4),
'visible' => $faker->boolean(), 'visible' => $faker->boolean(),
]; ];
}); });
@@ -46,7 +46,7 @@ $factory->define(Incident::class, function ($faker) {
return [ return [
'name' => $faker->sentence(), 'name' => $faker->sentence(),
'message' => $faker->paragraph(), 'message' => $faker->paragraph(),
'status' => random_int(1, 4), 'status' => mt_rand(1, 4),
'visible' => 1, 'visible' => 1,
'stickied' => false, 'stickied' => false,
]; ];
@@ -64,7 +64,7 @@ $factory->define(IncidentUpdate::class, function ($faker) {
return [ return [
'incident_id' => factory(Incident::class)->create()->id, 'incident_id' => factory(Incident::class)->create()->id,
'message' => $faker->paragraph(), 'message' => $faker->paragraph(),
'status' => random_int(1, 4), 'status' => mt_rand(1, 4),
'user_id' => factory(User::class)->create()->id, 'user_id' => factory(User::class)->create()->id,
]; ];
}); });
@@ -85,7 +85,7 @@ $factory->define(Metric::class, function ($faker) {
$factory->define(MetricPoint::class, function ($faker) { $factory->define(MetricPoint::class, function ($faker) {
return [ return [
'metric_id' => factory(Metric::class)->create()->id, 'metric_id' => factory(Metric::class)->create()->id,
'value' => random_int(1, 100), 'value' => mt_rand(1, 100),
'counter' => 1, 'counter' => 1,
]; ];
}); });