8 files changed, 89 insertions, 65 deletions

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index bff1733..9c5d228 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -147,7 +147,7 @@ class NodesController < ApplicationController
   end
 
   def publish
-    @node.publish_draft!
+    @node.publish_draft!(current_user)
     flash[:notice] = "Draft has been published"
     redirect_to node_path(@node)
   end
diff --git a/app/controllers/page_translations_controller.rb b/app/controllers/page_translations_controller.rb
index 38a7c4f..be4f488 100644
--- a/app/controllers/page_translations_controller.rb
+++ b/app/controllers/page_translations_controller.rb
@@ -63,6 +63,9 @@ class PageTranslationsController < ApplicationController
     draft.translations.where(:locale => @locale).delete_all
     draft.reload
 
+    NodeAction.record!(:node => @node, :page => draft, :user => current_user,
+                        :action => "translation_destroy", :locale => @locale)
+
     flash[:notice] = "#{@locale.upcase} translation removed from the draft. Publish to make this permanent."
     redirect_to node_path(@node)
   rescue LockedByAnotherUser => e
diff --git a/app/models/node.rb b/app/models/node.rb
index 311c5c0..b41df06 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -170,10 +170,12 @@ class Node < ApplicationRecord
       self.autosave.destroy
       self.autosave_id = nil
       self.save!
+      NodeAction.record!(:node => self, :user => current_user, :action => "discard_autosave")
     elsif self.draft && self.head
       self.draft.destroy
       self.draft_id = nil
       self.save!
+      NodeAction.record!(:node => self, :user => current_user, :action => "destroy_draft")
     end
 
     self.unlock! unless self.draft
@@ -188,43 +190,50 @@ class Node < ApplicationRecord
     end
   end
 
-  def publish_draft!
+  def publish_draft! current_user = nil
     # Return nil if nothing to publish and no staged changes
     return nil unless self.draft || staged_slug || staged_parent_id
 
-    if self.draft
-      self.head = self.draft
-      self.head.published_at ||= Time.now
-      self.head.save!
-      self.draft = nil
-    end
-
-    if staged_slug && (staged_slug != slug)
-      self.slug = staged_slug
-      self.staged_slug = nil
-    end
+    ActiveRecord::Base.transaction do
+      if self.draft
+        previous_title = self.head ? Globalize.with_locale(I18n.default_locale) { self.head.title } : nil
+        self.head = self.draft
+        self.head.published_at ||= Time.now
+        self.head.save!
+        self.draft = nil
 
-    if staged_parent_id && (staged_parent_id != parent_id)
-      new_parent = Node.find(staged_parent_id)
+        new_title = Globalize.with_locale(I18n.default_locale) { self.head.title }
+        NodeAction.record!(:node => self, :page => self.head, :user => current_user,
+                            :action => "publish", :from => previous_title, :to => new_title)
+      end
 
-      if new_parent == self || self.descendants.include?(new_parent)
-        raise ActiveRecord::RecordInvalid.new(self), "Cannot move a node under itself or one of its own descendants"
+      if staged_slug && (staged_slug != slug)
+        self.slug = staged_slug
+        self.staged_slug = nil
       end
 
-      self.staged_parent_id = nil
-      self.save!
-      self.move_to_child_of(new_parent)
-    else
-      unless self.save
-        raise ActiveRecord::RecordInvalid.new(self)
+      if staged_parent_id && (staged_parent_id != parent_id)
+        new_parent = Node.find(staged_parent_id)
+
+        if new_parent == self || self.descendants.include?(new_parent)
+          raise ActiveRecord::RecordInvalid.new(self), "Cannot move a node under itself or one of its own descendants"
+        end
+
+        self.staged_parent_id = nil
+        self.save!
+        self.move_to_child_of(new_parent)
+      else
+        unless self.save
+          raise ActiveRecord::RecordInvalid.new(self)
+        end
       end
-    end
 
-    self.reload
-    self.update_unique_name
-    self.send(:update_unique_names_of_children)
-    self.unlock!
-    self
+      self.reload
+      self.update_unique_name
+      self.send(:update_unique_names_of_children)
+      self.unlock!
+      self
+    end
   end
 
   def restore_revision! revision
diff --git a/app/models/node_action.rb b/app/models/node_action.rb
new file mode 100644
index 0000000..f32b5b7
--- /dev/null
+++ b/app/models/node_action.rb
@@ -0,0 +1,33 @@
+class NodeAction < ApplicationRecord
+  belongs_to :node, optional: true
+  belongs_to :page, optional: true
+  belongs_to :user, optional: true
+
+  validates :action, presence: true
+  validates :occurred_at, presence: true
+
+  def self.record!(node:, action:, user: nil, page: nil, locale: nil, **extra)
+    create!(
+      :node        => node,
+      :page        => page,
+      :user        => user,
+      :action      => action,
+      :locale      => locale,
+      :occurred_at => Time.now,
+      :metadata    => {
+        "username"                 => user&.login,
+        "human_readable_node_name" => Globalize.with_locale(I18n.default_locale) {
+                                        node&.head&.title || node&.draft&.title
+                                      },
+      }.merge(extra.stringify_keys)
+   )
+  end
+
+  def actor_name
+    metadata["username"] || "unknown"
+  end
+
+  def subject_name
+    metadata["human_readable_node_name"] || node&.unique_name || "deleted node"
+  end
+end
diff --git a/app/views/admin/_recent_changes.html.erb b/app/views/admin/_recent_changes.html.erb
deleted file mode 100644
index 88b5e93..0000000
--- a/app/views/admin/_recent_changes.html.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<h2>Recent Changes</h2>
-<div id="draft_list">
-  <table>
-    <tr class="header">
-      <th>Title</th>
-      <th>path</th>
-      <th>user</th>
-      <th>date</th>
-      <th></th>
-    </tr>
-    <% @recent_changes.each do |node| %>
-    <tr>
-      <td><%= truncated_title_for_node node %></td>
-      <td><%= node.unique_name %></td>
-      <td><%= node.draft.user.login rescue "" %></td>
-      <td><%= node.updated_at.to_fs(:db) %></td>
-      <td class="actions">
-        <%= link_to 'Show', node_path(node) %>
-        <%= link_to "Revisions", revision_path(:id => node.id) %>
-      </td>
-    </tr>
-    <% end %>
-  </table>
-</div>
\ No newline at end of file
diff --git a/app/views/admin/index.html.erb b/app/views/admin/index.html.erb
index bdb555e..a9c0512 100644
--- a/app/views/admin/index.html.erb
+++ b/app/views/admin/index.html.erb
@@ -43,17 +43,7 @@
   <div class="dashboard_widget">
     <h3>Recent changes</h3>
     <ul>
-    <% @recent_changes.each do |node| %>
-      <li>
-        <div>
-          <%= link_to title_for_node(node), node_path(node) %>
-          <span class="field_hint"><%= link_to_path("#{node.unique_name} ↗", node.unique_name) %></span>
-        </div>
-        <span class="dashboard_widget_meta">
-          <%= (editor = node_head_editor(node)) ? t("published_by", editor: editor) : t("published") %>, <%= relative_time_phrase(node.head.updated_at) %>
-        </span>
-      </li>
-    <% end %>
+      <%= render partial: "nodes/recent_change_item", collection: @recent_changes, as: :node %>
     </ul>
     <%= link_to "See all recent changes →", recent_nodes_path %>
   </div>
diff --git a/app/views/nodes/_recent_change_item.html.erb b/app/views/nodes/_recent_change_item.html.erb
new file mode 100644
index 0000000..754a775
--- /dev/null
+++ b/app/views/nodes/_recent_change_item.html.erb
@@ -0,0 +1,9 @@
+<li>
+  <div>
+    <%= link_to title_for_node(node), node_path(node) %>
+    <span class="field_hint"><%= link_to_path("#{node.unique_name} ↗", node.unique_name) %></span>
+  </div>
+  <span class="dashboard_widget_meta">
+    <%= (editor = node_head_editor(node)) ? t("last_edited_by", editor: editor) : t("last_edited") %>, <%= relative_time_phrase(node.head.updated_at) %>
+  </span>
+</li>
diff --git a/app/views/nodes/recent.html.erb b/app/views/nodes/recent.html.erb
index 3602775..d256253 100644
--- a/app/views/nodes/recent.html.erb
+++ b/app/views/nodes/recent.html.erb
@@ -1,3 +1,7 @@
 <h1>Recently changed</h1>
 
-<%= render 'node_list' %>
+<%= will_paginate @nodes %>
+<ul id="recent_changes_full_list">
+  <%= render partial: "nodes/recent_change_item", collection: @nodes, as: :node %>
+</ul>
+<%= will_paginate @nodes %>