diff --git a/app/Http/Controllers/Dashboard/IncidentController.php b/app/Http/Controllers/Dashboard/IncidentController.php index 5938f84c..0b9e9758 100644 --- a/app/Http/Controllers/Dashboard/IncidentController.php +++ b/app/Http/Controllers/Dashboard/IncidentController.php @@ -298,6 +298,7 @@ class IncidentController extends Controller public function showIncidentUpdates(Incident $incident) { $updates = IncidentUpdate::byIncident($incident)->orderBy('created_at', 'desc')->get(); + return View::make('dashboard.incidents.updates.index')->withIncident($incident)->withUpdates($updates); } @@ -340,11 +341,10 @@ class IncidentController extends Controller ->withSuccess(sprintf('%s %s', trans('dashboard.notifications.awesome'), trans('dashboard.incidents.updates.success'))); } - /** * Shows the edit incident view. * - * @param \CachetHQ\Cachet\Models\Incident $incident + * @param \CachetHQ\Cachet\Models\Incident $incident * @param \CachetHQ\Cachet\Models\IncidentUpdate $incidentUpdate * * @return \Illuminate\View\View @@ -357,9 +357,9 @@ class IncidentController extends Controller } /** - * Edit an incident. + * Edit an incident update. * - * @param \CachetHQ\Cachet\Models\Incident $incident + * @param \CachetHQ\Cachet\Models\Incident $incident * @param \CachetHQ\Cachet\Models\IncidentUpdate $incidentUpdate * * @return \Illuminate\Http\RedirectResponse diff --git a/app/Http/Routes/Dashboard/IncidentRoutes.php b/app/Http/Routes/Dashboard/IncidentRoutes.php index e822247c..3519cf49 100644 --- a/app/Http/Routes/Dashboard/IncidentRoutes.php +++ b/app/Http/Routes/Dashboard/IncidentRoutes.php @@ -89,7 +89,6 @@ class IncidentRoutes 'as' => 'post:dashboard.incidents.updates.edit', 'uses' => 'IncidentController@editIncidentUpdateAction', ]); - }); } } diff --git a/app/Models/IncidentUpdate.php b/app/Models/IncidentUpdate.php index 846b48a0..2a8bc194 100644 --- a/app/Models/IncidentUpdate.php +++ b/app/Models/IncidentUpdate.php @@ -78,7 +78,7 @@ class IncidentUpdate extends Model implements HasPresenter * Scope all by incident. * * @param \Illuminate\Database\Eloquent\Builder $query - * @param \CachetHQ\Cachet\Models\Incident $incident + * @param \CachetHQ\Cachet\Models\Incident $incident * * @return \Illuminate\Database\Eloquent\Builder */ diff --git a/resources/lang/en/dashboard.php b/resources/lang/en/dashboard.php index 873955bb..5d1e5a42 100644 --- a/resources/lang/en/dashboard.php +++ b/resources/lang/en/dashboard.php @@ -24,7 +24,7 @@ return [ 'updates' => [ 'title' => 'Incident updates for :incident', 'count' => '{0} Zero Updates|[1] One Update|[2] Two Updates|[3,Inf] Several Updates', - 'add' => [ + 'add' => [ 'title' => 'Create new incident update', 'success' => 'Your new incident update has been created.', 'failure' => 'Something went wrong with the incident update.',