Show "user deleted" in activities table (#782)

userfrosting · Aug 12, 2017 · 3f13923 · 3f13923
1 parent f459ab1
commit 3f13923
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## v4.1.9-alpha
 - Fixes #780, and more efficient way to collect ids in Unique::getPaginatedQuery
+- Show "user deleted" in activities table (#782)
 - Improve handling of fatal/parse errors
 
 ## v4.1.8-alpha

diff --git a/app/sprinkles/admin/locale/en_US/messages.php b/app/sprinkles/admin/locale/en_US/messages.php
@@ -141,6 +141,7 @@
         "DELETE"            => "Delete user",
         "DELETE_CONFIRM"    => "Are you sure you want to delete the user <strong>{{name}}</strong>?",
         "DELETE_YES"        => "Yes, delete user",
+        "DELETED"           => "User deleted",
         "DISABLE"           => "Disable user",
         "EDIT"              => "Edit user",
         "ENABLE"            => "Enable user",

diff --git a/app/sprinkles/admin/templates/tables/activities.html.twig b/app/sprinkles/admin/templates/tables/activities.html.twig
@@ -45,13 +45,17 @@
 
     <script id="activity-table-column-user" type="text/x-handlebars-template">
         <td data-text="{{row.user.last_name}}">
-            <strong>
-                <a href="{{site.uri.public}}/users/u/{{row.user.user_name}}">{{row.user.first_name}} {{row.user.last_name}} ({{row.user.user_name}})</a>
-            </strong>
-            <div class="js-copy-container">
-                <span class="js-copy-target">{{row.user.email}}</span>
-                <button class="btn btn-xs uf-copy-trigger js-copy-trigger"><i class="fa fa-copy"></i></button>
-            </div>
+            {{#if row.user }}
+                <strong>
+                    <a href="{{site.uri.public}}/users/u/{{row.user.user_name}}">{{row.user.first_name}} {{row.user.last_name}} ({{row.user.user_name}})</a>
+                </strong>
+                <div class="js-copy-container">
+                    <span class="js-copy-target">{{row.user.email}}</span>
+                    <button class="btn btn-xs uf-copy-trigger js-copy-trigger"><i class="fa fa-copy"></i></button>
+                </div>
+            {{ else }}
+                <i>{% endverbatim %}{{translate("USER.DELETED")}}{% verbatim %}</i>
+            {{/if }}
         </td>
     </script>