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

Merge pull request #3809 from Data-Kiss/better-user-accountability

Browse Source 
Add username to the dashboard of who logged an incident or any incident updates.
This commit is contained in:
James Brooks
2019-11-02 10:34:49 +00:00
committed by GitHub
parent e0df467813 74b840a6cc
commit db7ab0d8a7
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/lang/en/cachet.php
View File

@@ -34,7 +34,7 @@ return [
'stickied' => 'Stickied Incidents', 'stickied' => 'Stickied Incidents',
'scheduled' => 'Maintenance', 'scheduled' => 'Maintenance',
'scheduled_at' => ', scheduled :timestamp', 'scheduled_at' => ', scheduled :timestamp',
'posted' => 'Posted :timestamp', 'posted' => 'Posted :timestamp by :username',
'posted_at' => 'Posted at :timestamp', 'posted_at' => 'Posted at :timestamp',
'status' => [ 'status' => [
1 => 'Investigating', 1 => 'Investigating',

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

@@ -35,7 +35,7 @@ return [
'failure' => 'Something went wrong updating the incident update', 'failure' => 'Something went wrong updating the incident update',
], ],
], ],
'reported_by' => 'Reported by :user', 'reported_by' => 'Reported :timestamp by :user',
'add' => [ 'add' => [
'title' => 'Report an incident', 'title' => 'Report an incident',
'success' => 'Incident added.', 'success' => 'Incident added.',

2
resources/views/dashboard/incidents/index.blade.php
View File

@@ -27,7 +27,7 @@
<p>{{ Str::words($incident->message, 5) }}</p> <p>{{ Str::words($incident->message, 5) }}</p>
@endif @endif
@if ($incident->user) @if ($incident->user)
<p><small>&mdash; {{ trans('dashboard.incidents.reported_by', ['user' => $incident->user->username]) }}</small></p> <p><small>&mdash; {{ trans('dashboard.incidents.reported_by', ['timestamp' => $incident->created_at_diff, 'user' => $incident->user->username]) }}</small></p>
@endif @endif
</div> </div>
<div class="col-xs-6 text-right"> <div class="col-xs-6 text-right">

2
resources/views/dashboard/incidents/updates/index.blade.php
View File

@@ -26,7 +26,7 @@
<div class="row striped-list-item"> <div class="row striped-list-item">
<div class="col-xs-6"> <div class="col-xs-6">
<strong>{{ Str::words($update->message, 8) }}</strong> <strong>{{ Str::words($update->message, 8) }}</strong>
<p><small>{{ trans('cachet.incidents.posted', ['timestamp' => $update->created_at_diff]) }}</small></p> <p><small>{{ trans('cachet.incidents.posted', ['timestamp' => $update->created_at_diff, 'username' => $update->user->username]) }}</small></p>
</div> </div>
<div class="col-xs-6 text-right"> <div class="col-xs-6 text-right">
<a href="{{ cachet_route('dashboard.incidents.updates.edit', ['incident' => $incident->id, 'incident_update' => $update]) }}" class="btn btn-default"> <a href="{{ cachet_route('dashboard.incidents.updates.edit', ['incident' => $incident->id, 'incident_update' => $update]) }}" class="btn btn-default">