Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Fixed problems in interacting of acts_as_versioned and optimistic locking.

Browse source
This commit is contained in:
Benjamin Meichsner 2009-05-20 15:26:53 +02:00
parent 2660d86b89
commit 255a4cd6c7
5 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/pages_controller.rb
View file

@ -19,7 +19,8 @@ class PagesController < ApplicationController
end
def new
@page = Page.new(:title => params[:title].capitalize.gsub("-", " "))
@page = Page.new
@page.title = params[:title].capitalize.gsub("-", " ") if params[:title]
respond_to do |format|
format.html # new.html.erb
@ -83,13 +84,13 @@ class PagesController < ApplicationController
def version
@page = Page.find(params[:id])
@version = @page.versions[params[:version].to_i - 1]
@version = Page::Version.find_by_page_id_and_lock_version params[:id], params[:version]
end
def revert
@page = Page.find(params[:id])
@page.revert_to(params[:version].to_i)
@page.revert_to!(params[:version].to_i)
render :action => 'edit'
redirect_to wiki_page_path(@page.permalink)
end
end