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

Fixes issue #1158

Browse Source
This commit is contained in:
phecho
2015-11-20 17:02:11 +08:00
parent 031d89ea4a
commit 32b66df5f0
8 changed files with 41 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Dashboard/ComponentController.php
View File

@@ -194,7 +194,7 @@ class ComponentController extends Controller
$component->tags()->sync($componentTags);
return Redirect::route('dashboard.components.add')
return Redirect::route('dashboard.components.index')
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.components.add.success')));
}
@@ -209,7 +209,8 @@ class ComponentController extends Controller
{
$this->dispatch(new RemoveComponentCommand($component));
return Redirect::route('dashboard.components.index');
return Redirect::route('dashboard.components.index')
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.components.delete.success')));
}
/**
@@ -223,7 +224,8 @@ class ComponentController extends Controller
{
$this->dispatch(new RemoveComponentGroupCommand($group));
return Redirect::route('dashboard.components.index');
return Redirect::route('dashboard.components.index')
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.components.delete.success')));
}
/**
@@ -270,7 +272,7 @@ class ComponentController extends Controller
->withErrors($e->getMessageBag());
}
return Redirect::route('dashboard.components.groups.add')
return Redirect::route('dashboard.components.groups')
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.components.groups.add.success')));
}

10
app/Http/Controllers/Dashboard/IncidentController.php
View File

@@ -129,7 +129,7 @@ class IncidentController extends Controller
->withErrors($e->getMessageBag());
}
return Redirect::route('dashboard.incidents.add')
return Redirect::route('dashboard.incidents.index')
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.incidents.add.success')));
}
@@ -169,7 +169,8 @@ class IncidentController extends Controller
{
$template->delete();
return Redirect::route('dashboard.incidents.index');
return Redirect::route('dashboard.templates.index')
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.incidents.templates.delete.success')));
}
/**
@@ -188,7 +189,7 @@ class IncidentController extends Controller
->withErrors($e->getMessageBag());
}
return Redirect::route('dashboard.templates.add')
return Redirect::route('dashboard.templates.index')
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.incidents.templates.add.success')));
}
@@ -203,7 +204,8 @@ class IncidentController extends Controller
{
$this->dispatch(new RemoveIncidentCommand($incident));
return Redirect::route('dashboard.incidents.index');
return Redirect::route('dashboard.incidents.index')
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.incidents.delete.success')));
}
/**

5
app/Http/Controllers/Dashboard/MetricController.php
View File

@@ -80,7 +80,7 @@ class MetricController extends Controller
->withErrors($e->getMessageBag());
}
return Redirect::route('dashboard.metrics.add')
return Redirect::route('dashboard.metrics.index')
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.metrics.add.success')));
}
@@ -106,7 +106,8 @@ class MetricController extends Controller
{
$this->dispatch(new RemoveMetricCommand($metric));
return Redirect::route('dashboard.metrics.index');
return Redirect::route('dashboard.metrics.index')
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.metrics.delete.success')));
}
/**

4
app/Http/Controllers/Dashboard/ScheduleController.php
View File

@@ -110,7 +110,7 @@ class ScheduleController extends Controller
->withErrors($e->getMessageBag());
}
return Redirect::route('dashboard.schedule.add')
return Redirect::route('dashboard.schedule.index')
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.schedule.add.success')));
}
@@ -182,6 +182,6 @@ class ScheduleController extends Controller
$schedule->delete();
return Redirect::route('dashboard.schedule.index')
->withWarning(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.schedule.delete.success')));
->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.schedule.delete.success')));
}
}

21
resources/lang/en/dashboard.php
View File

@@ -30,6 +30,10 @@ return [
'success' => 'Incident updated.',
'failure' => 'Something went wrong with the incident.',
],
'delete' => [
'success' => 'The incident has been deleted and will not show on your status page.',
'failure' => 'The incident could not be deleted. Please try again.',
],
// Incident templates
'templates' => [
@@ -45,6 +49,10 @@ return [
'success' => 'Template has been updated!',
'failure' => 'Something went wrong updating the incident template',
],
'delete' => [
'success' => 'The tmplate has been deleted.',
'failure' => 'The template could not be deleted. Please try again.',
],
],
],
@@ -85,6 +93,10 @@ return [
'success' => 'Component updated.',
'failure' => 'Something went wrong with the component.',
],
'delete' => [
'success' => 'Component deleted.',
'failure' => 'The Component could not be deleted. Please try again.',
],
// Component groups
'groups' => [
@@ -100,6 +112,11 @@ return [
'success' => 'Component group updated.',
'failure' => 'Something went wrong with the component group.',
],
'delete' => [
'success' => 'Component Group deleted.',
'failure' => 'The Component Group could not be deleted. Please try again.',
],
],
],
@@ -117,6 +134,10 @@ return [
'success' => 'Metric updated.',
'failure' => 'Something went wrong with the metric.',
],
'delete' => [
'success' => 'The metric has been deleted and will not show on your status page.',
'failure' => 'The metric could not be deleted. Please try again.',
],
],
// Subscribers
'subscribers' => [

1
resources/views/dashboard/components/groups/index.blade.php
View File

@@ -15,6 +15,7 @@
</a>
<div class="clearfix"></div>
</div>
@include('dashboard.partials.errors')
<div class="row">
<div class="col-sm-12 striped-list" id="component-group-list">
@forelse($groups as $group)

1
resources/views/dashboard/components/index.blade.php
View File

@@ -15,6 +15,7 @@
</a>
<div class="clearfix"></div>
</div>
@include('dashboard.partials.errors')
<div class="row">
<div class="col-sm-12 striped-list" id="component-list">
@forelse($components as $component)

1
resources/views/dashboard/templates/index.blade.php
View File

@@ -15,6 +15,7 @@
<div class="content-wrapper">
<div class="row">
<div class="col-sm-12">
@include('dashboard.partials.errors')
<div class="striped-list">
@forelse($incident_templates as $template)
<div class="row striped-list-item">