2 files changed, 9 insertions, 1 deletions

diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index 5756649..07cb5d1 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -49,7 +49,7 @@
                     form: { data: { confirm: "Publish this draft?" }, class: 'button_to state_changing' } %>
             </div>
           <% end %>
-          <% if @node.draft || @node.autosave %>
+          <% if @node.autosave || (@node.draft && @node.head) %>
             <div class="node_info_item">
               <%= button_to (@node.draft && !@node.autosave ? 'Destroy Draft' : 'Discard Autosave'),
                     revert_node_path(@node), method: :put,
diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index 37091d5..b563d4d 100644
--- a/test/controllers/nodes_controller_test.rb
+++ b/test/controllers/nodes_controller_test.rb
@@ -463,4 +463,12 @@ class NodesControllerTest < ActionController::TestCase
     put :revert, params: { :id => node.id }
     assert_redirected_to edit_node_path(node)
   end
+
+  test "nodes#show does not offer to destroy the only draft of a never-published node" do
+    node = Node.root.children.create!(:slug => "draft_only_test")
+    login_as :quentin
+    get :show, params: { :id => node.id }
+    assert_response :success
+    assert_select "form.destructive", :count => 0
+  end
 end