Fix validation of metric thresholds. Closes #3549

cachethq · Jun 23, 2019 · 2efbaeb · 2efbaeb · GeekJosh · Aug 12, 2019
1 parent 76e9f41
commit 2efbaeb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/app/Http/Controllers/Dashboard/MetricController.php b/app/Http/Controllers/Dashboard/MetricController.php
@@ -45,8 +45,7 @@ public function showMetrics()
     public function showAddMetric()
     {
         return View::make('dashboard.metrics.add')
-            ->withPageTitle(trans('dashboard.metrics.add.title').' - '.trans('dashboard.dashboard'))
-            ->withAcceptableThresholds(Metric::ACCEPTABLE_THRESHOLDS);
+            ->withPageTitle(trans('dashboard.metrics.add.title').' - '.trans('dashboard.dashboard'));
     }
 
     /**
@@ -132,8 +131,7 @@ public function showEditMetricAction(Metric $metric)
     {
         return View::make('dashboard.metrics.edit')
             ->withPageTitle(trans('dashboard.metrics.edit.title').' - '.trans('dashboard.dashboard'))
-            ->withMetric($metric)
-            ->withAcceptableThresholds(Metric::ACCEPTABLE_THRESHOLDS);
+            ->withMetric($metric);
     }
 
     /**

diff --git a/app/Models/Metric.php b/app/Models/Metric.php
@@ -62,13 +62,6 @@ class Metric extends Model implements HasPresenter
      */
     const VISIBLE_HIDDEN = 2;
 
-    /**
-     * Array of acceptable threshold minutes.
-     *
-     * @var int[]
-     */
-    const ACCEPTABLE_THRESHOLDS = [1, 2, 3, 4, 5, 6, 10, 12, 15, 20, 30, 60];
-
     /**
      * The model's attributes.
      *
@@ -134,7 +127,6 @@ class Metric extends Model implements HasPresenter
         'default_value' => 'required|numeric',
         'places'        => 'required|numeric|between:0,4',
         'default_view'  => 'required|numeric|between:0,3',
-        'threshold'     => 'required|numeric|between:0,10',
         'visible'       => 'required|numeric|between:0,2',
     ];