mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-02-13 03:45:26 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1.1'

Browse Source
This commit is contained in:
Graham Campbell 2015-08-03 21:07:31 +01:00
commit 5ce767dccc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Admin/IncidentController.php
View File

@ -215,7 +215,7 @@ class IncidentController extends AbstractController
return Redirect::back()->withInput(Binput::all())
->with('title', sprintf(
'%s %s',
trans('dashboard.notifications.awesome'),
trans('dashboard.notifications.whoops'),
trans('dashboard.incidents.templates.add.failure')
))
->with('errors', $template->getErrors());
@ -289,7 +289,7 @@ class IncidentController extends AbstractController
return Redirect::back()->withInput(Binput::all())
->with('title', sprintf(
'%s %s',
trans('dashboard.notifications.awesome'),
trans('dashboard.notifications.whoops'),
trans('dashboard.incidents.templates.edit.failure')
))
->with('errors', $incident->getErrors());

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

@ -116,7 +116,7 @@ class MetricController extends AbstractController
return Redirect::back()->withInput(Binput::all())
->with('title', sprintf(
'%s %s',
trans('dashboard.notifications.awesome'),
trans('dashboard.notifications.whoops'),
trans('dashboard.metrics.points.add.failure')
))
->with('errors', $point->getErrors());
@ -176,7 +176,7 @@ class MetricController extends AbstractController
return Redirect::back()->withInput(Binput::all())
->with('title', sprintf(
'<strong>%s</strong>',
trans('dashboard.notifications.awesome')
trans('dashboard.notifications.whoops')
))
->with('errors', $metric->getErrors());
}