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

Add username to the dashboard of who logged an incident or any incident updates.
cachethq · Nov 2, 2019 · db7ab0d · db7ab0d
2 parents e0df467 + 74b840a
commit db7ab0d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/resources/lang/en/cachet.php b/resources/lang/en/cachet.php
@@ -34,7 +34,7 @@
         'stickied'     => 'Stickied Incidents',
         'scheduled'    => 'Maintenance',
         'scheduled_at' => ', scheduled :timestamp',
-        'posted'       => 'Posted :timestamp',
+        'posted'       => 'Posted :timestamp by :username',
         'posted_at'    => 'Posted at :timestamp',
         'status'       => [
             1 => 'Investigating',

diff --git a/resources/lang/en/dashboard.php b/resources/lang/en/dashboard.php
@@ -35,7 +35,7 @@
                 'failure' => 'Something went wrong updating the incident update',
             ],
         ],
-        'reported_by'              => 'Reported by :user',
+        'reported_by'              => 'Reported :timestamp by :user',
         'add'                      => [
             'title'   => 'Report an incident',
             'success' => 'Incident added.',

diff --git a/resources/views/dashboard/incidents/index.blade.php b/resources/views/dashboard/incidents/index.blade.php
@@ -27,7 +27,7 @@
                             <p>{{ Str::words($incident->message, 5) }}</p>
                             @endif
                             @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
                         </div>
                         <div class="col-xs-6 text-right">

diff --git a/resources/views/dashboard/incidents/updates/index.blade.php b/resources/views/dashboard/incidents/updates/index.blade.php
@@ -26,7 +26,7 @@
                 <div class="row striped-list-item">
                     <div class="col-xs-6">
                         <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 class="col-xs-6 text-right">
                         <a href="{{ cachet_route('dashboard.incidents.updates.edit', ['incident' => $incident->id, 'incident_update' => $update]) }}" class="btn btn-default">