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

Completely remove the use of Redirect::back - closes #867

Browse Source
This commit is contained in:
James Brooks
2015-08-13 22:28:30 +01:00
parent bee4055228
commit b393557c8a
25 changed files with 73 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Http/Controllers/Admin/ComponentController.php
View File

@@ -113,7 +113,7 @@ class ComponentController extends Controller
try {
$component->update($_component);
} catch (ValidationException $e) {
return Redirect::back()
return Redirect::route('dashboard.components.edit', ['id' => $component->id])
->withInput(Binput::all())
->withTitle(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('dashboard.components.edit.failure')))
->withErrors($e->getMessageBag());
@@ -129,7 +129,7 @@ class ComponentController extends Controller
$component->tags()->sync($componentTags);
return Redirect::back()
return Redirect::route('dashboard.components.edit', ['id' => $component->id])
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.components.edit.success')));
}
@@ -159,7 +159,7 @@ class ComponentController extends Controller
try {
$component = Component::create($_component);
} catch (ValidationException $e) {
return Redirect::back()
return Redirect::route('dashboard.components.add')
->withInput(Binput::all())
->withTitle(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('dashboard.components.add.failure')))
->withErrors($e->getMessageBag());
@@ -175,7 +175,7 @@ class ComponentController extends Controller
$component->tags()->sync($componentTags);
return Redirect::back()
return Redirect::route('dashboard.components.add')
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.components.add.success')));
}
@@ -190,7 +190,7 @@ class ComponentController extends Controller
{
$component->delete();
return Redirect::back();
return Redirect::route('dashboard.components.index');
}
/**
@@ -208,7 +208,7 @@ class ComponentController extends Controller
$group->delete();
return Redirect::back();
return Redirect::route('dashboard.components.index');
}
/**
@@ -246,13 +246,13 @@ class ComponentController extends Controller
try {
$group = ComponentGroup::create(Binput::get('group'));
} catch (ValidationException $e) {
return Redirect::back()
return Redirect::route('dashboard.components.groups.add')
->withInput(Binput::all())
->withTitle(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('dashboard.components.groups.add.failure')))
->withErrors($e->getMessageBag());
}
return Redirect::back()
return Redirect::route('dashboard.components.groups.add')
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.components.groups.add.success')));
}
@@ -270,13 +270,13 @@ class ComponentController extends Controller
try {
$group->update($groupData);
} catch (ValidationException $e) {
return Redirect::back()
return Redirect::route('dashboard.components.group.edit', ['id' => $group->id])
->withInput(Binput::all())
->withTitle(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('dashboard.components.groups.edit.failure')))
->withErrors($e->getMessageBag());
}
return Redirect::back()
return Redirect::route('dashboard.components.group.edit', ['id' => $group->id])
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.components.groups.edit.success')));
}
}

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

@@ -121,7 +121,7 @@ class IncidentController extends Controller
try {
$incident = Incident::create($incidentData);
} catch (ValidationException $e) {
return Redirect::back()
return Redirect::route('dashboard.incidents.add')
->withInput(Binput::all())
->withTitle(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('dashboard.incidents.add.failure')))
->withErrors($e->getMessageBag());
@@ -136,7 +136,7 @@ class IncidentController extends Controller
event(new IncidentHasReportedEvent($incident));
}
return Redirect::back()
return Redirect::route('dashboard.incidents.add')
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.incidents.add.success')));
}
@@ -176,7 +176,7 @@ class IncidentController extends Controller
{
$template->delete();
return Redirect::back();
return Redirect::route('dashboard.incidents.index');
}
/**
@@ -189,13 +189,13 @@ class IncidentController extends Controller
try {
IncidentTemplate::create(Binput::get('template'));
} catch (ValidationException $e) {
return Redirect::back()
return Redirect::route('dashboard.templates.add')
->withInput(Binput::all())
->withTitle(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('dashboard.incidents.templates.add.failure')))
->withErrors($e->getMessageBag());
}
return Redirect::back()
return Redirect::route('dashboard.templates.add')
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.incidents.templates.add.success')));
}
@@ -210,7 +210,7 @@ class IncidentController extends Controller
{
$incident->delete();
return Redirect::back();
return Redirect::route('dashboard.incidents.index');
}
/**
@@ -251,7 +251,7 @@ class IncidentController extends Controller
try {
$incident->update($incidentData);
} catch (ValidationException $e) {
return Redirect::back()
return Redirect::route('dashboard.incidents.edit', ['id' => $incident->id])
->withInput(Binput::all())
->withTitle(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('dashboard.incidents.templates.edit.failure')))
->withErrors($e->getMessageBag());
@@ -263,7 +263,7 @@ class IncidentController extends Controller
$incident->component->update(['status' => $componentStatus]);
}
return Redirect::to('dashboard/incidents')
return Redirect::route('dashboard.incidents.edit', ['id' => $incident->id])
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.incidents.edit.success')));
}
@@ -279,12 +279,12 @@ class IncidentController extends Controller
try {
$template->update(Binput::get('template'));
} catch (ValidationException $e) {
return Redirect::back()
return Redirect::route('dashboard.templates.edit', ['id' => $template->id])
->withUpdatedTemplate($template)
->withTemplateErrors($e->getMessageBag()->getErrors());
}
return Redirect::back()
return Redirect::route('dashboard.templates.edit', ['id' => $template->id])
->withUpdatedTemplate($template);
}
}

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

@@ -68,13 +68,13 @@ class MetricController extends Controller
try {
Metric::create(Binput::get('metric'));
} catch (ValidationException $e) {
return Redirect::back()
return Redirect::route('dashboard.metrics.add')
->withInput(Binput::all())
->withTitle(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('dashboard.metrics.add.failure')))
->withErrors($e->getMessageBag());
}
return Redirect::back()
return Redirect::route('dashboard.metrics.add')
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.metrics.add.success')));
}
@@ -89,26 +89,6 @@ class MetricController extends Controller
->withPageTitle(trans('dashboard.metrics.points.add.title').' - '.trans('dashboard.dashboard'));
}
/**
* Creates a new metric point.
*
* @return \Illuminate\Http\RedirectResponse
*/
public function createMetricPointAction()
{
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());
}
return Redirect::back()
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.metrics.points.add.success')));
}
/**
* Deletes a given metric.
*
@@ -120,7 +100,7 @@ class MetricController extends Controller
{
$metric->delete();
return Redirect::back();
return Redirect::route('dashboard.metrics.index');
}
/**
@@ -149,13 +129,13 @@ class MetricController extends Controller
try {
$metric->update(Binput::get('metric', null, false));
} catch (ValidationException $e) {
return Redirect::back()
return Redirect::route('dashboard.metrics.edit', ['id' => $metric->id])
->withInput(Binput::all())
->withTitle(sprintf('<strong>%s</strong>', trans('dashboard.notifications.whoops')))
->withErrors($e->getMessageBag());
}
return Redirect::to('dashboard/metrics')
return Redirect::route('dashboard.metrics.edit', ['id' => $metric->id])
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.metrics.edit.success')));
}
}

18
app/Http/Controllers/Admin/ScheduleController.php
View File

@@ -44,13 +44,13 @@ class ScheduleController extends Controller
$this->subMenu = [
'incidents' => [
'title' => trans('dashboard.incidents.incidents'),
'url' => route('dashboard.incidents'),
'url' => route('dashboard.incidents.index'),
'icon' => 'ion-android-checkmark-circle',
'active' => false,
],
'schedule' => [
'title' => trans('dashboard.schedule.schedule'),
'url' => route('dashboard.schedule'),
'url' => route('dashboard.schedule.index'),
'icon' => 'ion-android-calendar',
'active' => true,
],
@@ -101,7 +101,7 @@ class ScheduleController extends Controller
$messageBag = new MessageBag();
$messageBag->add('scheduled_at', trans('validation.date', ['attribute' => 'scheduled time you supplied']));
return Redirect::back()->withErrors($messageBag);
return Redirect::route('dashboard.schedule.add')->withErrors($messageBag);
}
$scheduleData['scheduled_at'] = $scheduledAt;
@@ -111,7 +111,7 @@ class ScheduleController extends Controller
try {
Incident::create($scheduleData);
} catch (ValidationException $e) {
return Redirect::back()
return Redirect::route('dashboard.schedule.add')
->withInput(Binput::all())
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('dashboard.schedule.add.failure')))
->withErrors($e->getMessageBag());
@@ -121,7 +121,7 @@ class ScheduleController extends Controller
event(new MaintenanceHasScheduledEvent($incident));
}
return Redirect::back()
return Redirect::route('dashboard.schedule.add')
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.schedule.add.success')));
}
@@ -159,7 +159,7 @@ class ScheduleController extends Controller
$messageBag = new MessageBag();
$messageBag->add('scheduled_at', trans('validation.date', ['attribute' => 'scheduled time you supplied']));
return Redirect::back()->withErrors($messageBag);
return Redirect::route('dashboard.schedule.edit', ['id' => $schedule->id])->withErrors($messageBag);
}
$scheduleData['scheduled_at'] = $scheduledAt;
@@ -169,13 +169,13 @@ class ScheduleController extends Controller
try {
$schedule->update($scheduleData);
} catch (ValidationException $e) {
return Redirect::back()
return Redirect::route('dashboard.schedule.edit', ['id' => $schedule->id])
->withInput(Binput::all())
->withTitle(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('dashboard.schedule.edit.failure')))
->withErrors($e->getMessageBag());
}
return Redirect::to('dashboard/schedule')
return Redirect::route('dashboard.schedule.edit', ['id' => $schedule->id])
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.schedule.edit.success')));
}
@@ -190,7 +190,7 @@ class ScheduleController extends Controller
{
$schedule->delete();
return Redirect::back()
return Redirect::route('dashboard.schedule.index')
->withWarning(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('dashboard.schedule.delete.failure')));
}
}

10
app/Http/Controllers/Admin/SettingsController.php
View File

@@ -138,15 +138,15 @@ class SettingsController extends Controller
$maxSize = $file->getMaxFilesize();
if ($file->getSize() > $maxSize) {
return Redirect::back()->withErrors(trans('dashboard.settings.app-setup.too-big', ['size' => $maxSize]));
return Redirect::route('dashboard.settings.setup')->withErrors(trans('dashboard.settings.app-setup.too-big', ['size' => $maxSize]));
}
if (!$file->isValid() || $file->getError()) {
return Redirect::back()->withErrors($file->getErrorMessage());
return Redirect::route('dashboard.settings.setup')->withErrors($file->getErrorMessage());
}
if (strpos($file->getMimeType(), 'image/') !== 0) {
return Redirect::back()->withErrors(trans('dashboard.settings.app-setup.images-only'));
return Redirect::route('dashboard.settings.setup')->withErrors(trans('dashboard.settings.app-setup.images-only'));
}
// Store the banner.
@@ -165,12 +165,12 @@ class SettingsController extends Controller
Setting::firstOrCreate(['name' => $settingName])->update(['value' => $settingValue]);
}
} catch (Exception $e) {
return Redirect::back()->withErrors(trans('dashboard.settings.edit.failure'));
return Redirect::route('dashboard.settings.setup')->withErrors(trans('dashboard.settings.edit.failure'));
}
Lang::setLocale(Binput::get('app_locale'));
return Redirect::back()
return Redirect::route('dashboard.settings.setup')
->withSuccess(trans('dashboard.settings.edit.success'));
}
}

6
app/Http/Controllers/Admin/SubscriberController.php
View File

@@ -58,7 +58,7 @@ class SubscriberController extends Controller
try {
$subscriber = Subscriber::create(['email' => $email]);
} catch (ValidationException $e) {
return Redirect::back()
return Redirect::route('dashboard.subscribers.add')
->withInput(Binput::all())
->withTitle(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('dashboard.subscribers.add.failure')))
->withErrors($e->getMessageBag());
@@ -66,7 +66,7 @@ class SubscriberController extends Controller
event(new CustomerHasSubscribedEvent($subscriber));
return Redirect::back()
return Redirect::route('dashboard.subscribers.add')
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.subscribers.add.success')));
}
@@ -83,6 +83,6 @@ class SubscriberController extends Controller
{
$subscriber->delete();
return Redirect::back();
return Redirect::route('dashboard.subscribers.index');
}
}

10
app/Http/Controllers/Admin/TeamController.php
View File

@@ -67,13 +67,13 @@ class TeamController extends Controller
try {
User::create(Binput::all());
} catch (ValidationException $e) {
return Redirect::back()
return Redirect::route('dashboard.team.add')
->withInput(Binput::except('password'))
->withTitle(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('dashboard.team.add.failure')))
->withErrors($e->getMessageBag());
}
return Redirect::back()
return Redirect::route('dashboard.team.add')
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.team.add.success')));
}
@@ -97,13 +97,13 @@ class TeamController extends Controller
try {
$user->update($items);
} catch (ValidationException $e) {
return Redirect::back()
return Redirect::route('dashboard.team.edit', ['id' => $user->id])
->withInput(Binput::except('password'))
->withTitle(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('dashboard.team.edit.failure')))
->withErrors($e->getMessageBag());
}
return Redirect::back()
return Redirect::route('dashboard.team.edit', ['id' => $user->id])
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.team.edit.success')));
}
@@ -118,7 +118,7 @@ class TeamController extends Controller
{
$user->delete();
return Redirect::route('dashboard.team')
return Redirect::route('dashboard.team.index')
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.team.delete.success')));
}
}

6
app/Http/Controllers/Admin/UserController.php
View File

@@ -59,13 +59,13 @@ class UserController extends Controller
try {
Auth::user()->update($items);
} catch (ValidationException $e) {
return Redirect::back()
return Redirect::route('dashboard.user')
->withInput(Binput::except('password'))
->withTitle(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('dashboard.team.edit.failure')))
->withErrors($e->getMessageBag());
}
return Redirect::back()
return Redirect::route('dashboard.user')
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.team.edit.success')));
}
@@ -79,6 +79,6 @@ class UserController extends Controller
$user->api_key = User::generateApiKey();
$user->save();
return Redirect::back();
return Redirect::route('dashboard.user');
}
}

2
app/Http/Controllers/AuthController.php
View File

@@ -59,7 +59,7 @@ class AuthController extends Controller
return Redirect::intended('dashboard');
}
return Redirect::back()
return Redirect::route('auth.login')
->withInput(Binput::except('password'))
->withError(trans('forms.login.invalid'));
}

2
app/Http/Controllers/SetupController.php
View File

@@ -179,7 +179,7 @@ class SetupController extends Controller
return Response::json(['errors' => $v->getMessageBag()], 400);
}
return Redirect::back()->withInput()->withErrors($v->getMessageBag());
return Redirect::route('setup.index')->withInput()->withErrors($v->getMessageBag());
}
/**

2
app/Http/Controllers/SubscribeController.php
View File

@@ -47,7 +47,7 @@ class SubscribeController extends Controller
try {
$subscriber = Subscriber::create(['email' => Binput::get('email')]);
} catch (ValidationException $e) {
return Redirect::back()
return Redirect::route('subscribe.subscribe')
->withInput(Binput::all())
->withTitle(sprintf('<strong>%s</strong> %s', trans('dashboard.notifications.whoops'), trans('cachet.subscriber.email.failure')))
->withErrors($e->getMessageBag());