From 83a83770e705dc42c2d3ee28e8477a4f8dc4a10b Mon Sep 17 00:00:00 2001 From: hukl Date: Sun, 15 Feb 2009 22:56:09 +0100 Subject: using real users now that we have a real user model --- app/controllers/nodes_controller.rb | 3 ++- app/views/nodes/edit.html.erb | 11 ++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb index 19fbb57..2915acc 100644 --- a/app/controllers/nodes_controller.rb +++ b/app/controllers/nodes_controller.rb @@ -33,7 +33,8 @@ class NodesController < ApplicationController def update draft = @node.find_or_create_draft current_user - if request.post? && draft.update_attributes( params[:page] ) + + if draft.update_attributes( params[:page] ) redirect_to(@node) else render :action => :edit diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb index 433c5eb..67e3c56 100644 --- a/app/views/nodes/edit.html.erb +++ b/app/views/nodes/edit.html.erb @@ -4,10 +4,8 @@ <% form_for(@node) do |f| %> <%= f.error_messages %> - - <% if draft = @node.find_or_create_draft( User.first ) %> - <% fields_for @node.draft do |d| %> + <% fields_for @node.find_or_create_draft( current_user ) do |d| %>

<%= d.label :title %>
<%= d.text_field :title %> @@ -21,12 +19,7 @@ <%= d.text_area :body %>

<% end %> - - <% else %> - -

Page is locked

- - <% end %> +

<%= f.submit "Update" %>

-- cgit v1.3