Destroying Draft or Discarding Autosave drops you where you left

3 files changed, 6 insertions, 1 deletions

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index d1538e1..6fcd930 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -128,7 +128,10 @@ class NodesController < ApplicationController
   def revert
     @node.lock_for_editing!(current_user)
     @node.revert!(current_user)
-    if @node.draft
+
+    if params[:return_to].present?
+      redirect_to safe_return_to(params[:return_to])
+    elsif @node.draft
       redirect_to edit_node_path(@node)
     else
       redirect_to node_path(@node)
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index 2469310..8b9e98b 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -53,6 +53,7 @@
             <div class="node_info_item">
               <%= button_to (@node.draft && !@node.autosave ? 'Destroy Draft' : 'Discard Autosave'),
                     revert_node_path(@node), method: :put,
+                    params: { return_to: request.path },
                     form: { data: { confirm: "This cannot be undone. Continue?" }, class: 'button_to destructive' } %>
             </div>
           <% end %>
diff --git a/app/views/revisions/diff.html.erb b/app/views/revisions/diff.html.erb
index 3157dca..490cf17 100644
--- a/app/views/revisions/diff.html.erb
+++ b/app/views/revisions/diff.html.erb
@@ -36,6 +36,7 @@
     <% if !@locked_by_other && (@node.autosave || @node.draft) %>
       <%= button_to (@node.draft && !@node.autosave ? 'Destroy Draft' : 'Discard Autosave'),
             revert_node_path(@node), method: :put,
+            params: { return_to: request.fullpath },
             form: { data: { confirm: "This cannot be undone. Continue?" }, class: 'button_to destructive' } %>
     <% end %>
   </p>