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

Refactor validator stuff and fix variable names in views

Browse Source
This commit is contained in:
Graham Campbell
2015-08-03 22:32:36 +01:00
parent 5d958bac81
commit fcbbfdd84e
56 changed files with 514 additions and 766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
app/Http/Controllers/Admin/MetricController.php
View File

@@ -11,6 +11,7 @@
namespace CachetHQ\Cachet\Http\Controllers\Admin;
use AltThree\Validator\ValidationException;
use CachetHQ\Cachet\Http\Controllers\AbstractController;
use CachetHQ\Cachet\Models\Metric;
use CachetHQ\Cachet\Models\MetricPoint;
@@ -29,10 +30,9 @@ class MetricController extends AbstractController
{
$metrics = Metric::orderBy('created_at', 'desc')->get();
return View::make('dashboard.metrics.index')->with([
'page_title' => trans('dashboard.metrics.metrics').' - '.trans('dashboard.dashboard'),
'metrics' => $metrics,
]);
return View::make('dashboard.metrics.index')
->withPageTitle(trans('dashboard.metrics.metrics').' - '.trans('dashboard.dashboard'))
->withMetrics($metrics);
}
/**
@@ -42,10 +42,8 @@ class MetricController extends AbstractController
*/
public function showAddMetric()
{
return View::make('dashboard.metrics.add')->with([
'page_title' => trans('dashboard.metrics.add.title').' - '.trans('dashboard.dashboard'),
'metricMetricPoints' => MetricPoint::all(),
]);
return View::make('dashboard.metrics.add')
->withPageTitle(trans('dashboard.metrics.add.title').' - '.trans('dashboard.dashboard'));
}
/**
@@ -55,10 +53,9 @@ class MetricController extends AbstractController
*/
public function showMetricPoints()
{
return View::make('dashboard.metrics.points.index')->with([
'page_title' => trans('dashboard.metrics.points.title').' - '.trans('dashboard.dashboard'),
'metricMetricPoints' => MetricPoint::all(),
]);
return View::make('dashboard.metrics.points.index')
->withPageTitle(trans('dashboard.metrics.points.title').' - '.trans('dashboard.dashboard'))
->withMetrics(MetricPoint::all());
}
/**
@@ -68,26 +65,17 @@ class MetricController extends AbstractController
*/
public function createMetricAction()
{
$metricData = Binput::get('metric');
$metric = Metric::create($metricData);
if (!$metric->isValid()) {
return Redirect::back()->withInput(Binput::all())
->with('title', sprintf(
'%s %s',
trans('dashboard.notifications.whoops'),
trans('dashboard.metrics.add.failure')
))
->with('errors', $metric->getErrors());
try {
Metric::create(Binput::get('metric'));
} catch (ValidationException $e) {
return Redirect::back()
->withInput(Binput::all())
->withTitle(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('dashboard.metrics.add.failure')))
->withErrors($e->getMessageBag());
}
$successMsg = sprintf(
'%s %s',
trans('dashboard.notifications.awesome'),
trans('dashboard.metrics.add.success')
);
return Redirect::back()->with('success', $successMsg);
return Redirect::back()
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.metrics.add.success')));
}
/**
@@ -97,9 +85,8 @@ class MetricController extends AbstractController
*/
public function showAddMetricPoint()
{
return View::make('dashboard.metrics.points.add')->with([
'page_title' => trans('dashboard.metrics.points.add.title').' - '.trans('dashboard.dashboard'),
]);
return View::make('dashboard.metrics.points.add')
->withPageTitle(trans('dashboard.metrics.points.add.title').' - '.trans('dashboard.dashboard'));
}
/**
@@ -109,26 +96,17 @@ class MetricController extends AbstractController
*/
public function createMetricPointAction()
{
$_point = Binput::get('point', null, false);
$point = MetricPoint::create($_point);
if (!$point->isValid()) {
return Redirect::back()->withInput(Binput::all())
->with('title', sprintf(
'%s %s',
trans('dashboard.notifications.whoops'),
trans('dashboard.metrics.points.add.failure')
))
->with('errors', $point->getErrors());
try {
MetricPoint::create(Binput::get('point', null, false));
} catch (ValidationException $e) {
return Redirect::back()
->withInput(Binput::all())
->withTitle(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('dashboard.metrics.points.add.failure')))
->withErrors($e->getMessageBag());
}
$successMsg = sprintf(
'%s %s',
trans('dashboard.notifications.awesome'),
trans('dashboard.metrics.points.add.success')
);
return Redirect::back()->with('success', $successMsg);
return Redirect::back()
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.metrics.points.add.success')));
}
/**
@@ -154,10 +132,9 @@ class MetricController extends AbstractController
*/
public function showEditMetricAction(Metric $metric)
{
return View::make('dashboard.metrics.edit')->with([
'page_title' => trans('dashboard.metrics.edit.title').' - '.trans('dashboard.dashboard'),
'metric' => $metric,
]);
return View::make('dashboard.metrics.edit')
->withPageTitle(trans('dashboard.metrics.edit.title').' - '.trans('dashboard.dashboard'))
->withMetric($metric);
}
/**
@@ -169,24 +146,16 @@ class MetricController extends AbstractController
*/
public function editMetricAction(Metric $metric)
{
$metricData = Binput::get('metric', null, false);
$metric->update($metricData);
if (!$metric->isValid()) {
return Redirect::back()->withInput(Binput::all())
->with('title', sprintf(
'<strong>%s</strong>',
trans('dashboard.notifications.whoops')
))
->with('errors', $metric->getErrors());
try {
$metric->update(Binput::get('metric', null, false));
} catch (ValidationException $e) {
return Redirect::back()
->withInput(Binput::all())
->withTitle(sprintf('<strong>%s</strong>', trans('dashboard.notifications.whoops')))
->withErrors($e->getMessageBag());
}
$successMsg = sprintf(
'%s %s',
trans('dashboard.notifications.awesome'),
trans('dashboard.metrics.edit.success')
);
return Redirect::to('dashboard/metrics')->with('success', $successMsg);
return Redirect::to('dashboard/metrics')
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.metrics.edit.success')));
}
}