Merge branch 'master' into erdgeist-modernize-autherdgeist-modernize-auth

2 files changed, 25 insertions, 1 deletions

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 37fd78b..40cfbdc 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -7,6 +7,7 @@ class AdminController < ApplicationController
   def index
     @drafts = Node.drafts_and_autosaves(current_user_id: current_user.id).limit(5)
     @recent_changes = Node.recently_changed.limit(5)
+    @actions = NodeAction.order(:occurred_at => :desc, :id => :desc).limit(5)
   end
 
   def conventions
diff --git a/app/views/admin/index.html.erb b/app/views/admin/index.html.erb
index a9c0512..1b4a0a0 100644
--- a/app/views/admin/index.html.erb
+++ b/app/views/admin/index.html.erb
@@ -40,13 +40,36 @@
     <%= link_to "See all drafts →", drafts_nodes_path %>
   </div>
 
-  <div class="dashboard_widget">
+  <!--div class="dashboard_widget">
     <h3>Recent changes</h3>
     <ul>
       <%= render partial: "nodes/recent_change_item", collection: @recent_changes, as: :node %>
     </ul>
     <%= link_to "See all recent changes →", recent_nodes_path %>
+  </div-->
+
+  <div class="dashboard_widget">
+    <h3>Recent changes</h3>
+    <table id="node_action_list">
+      <% @actions.each do |action| %>
+        <tr class="node_action node_action--<%= action.action %>">
+          <td class="node_action_time"><%= raw(action.occurred_at.strftime("%Y-%m-%d %H:%M").gsub(" ", "<br/>")) %></td>
+          <td class="node_action_body">
+            <%= action_summary(action) %>
+            <% if action.node_id && params[:node_id].blank? %>
+              <%= link_to t("node_actions.node_history"), admin_log_path(:node_id => action.node_id), :class => "node_action_zoom" %>
+            <% end %>
+            <% if action.inferred_from %>
+              <span class="node_action_inferred" title="<%= action.inferred_from %>"><%= t("node_actions.backfilled") %></span>
+            <% end %>
+            <%= render "node_actions/change_details", :action_entry => action if action_details?(action) %>
+          </td>
+        </tr>
+      <% end %>
+    </table>
+    <%= link_to "See all recent changes →", admin_log_path %>
   </div>
+
 </div>
 
 <div id="dashboard_housekeeping">