deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Gentler

Browse source 
Be a little gentler in recovering from Instiki::ValidationErrors, when saving a page.
Previously, we threw away all the user's changes upon the redirect. Now we attempt
to salvage what he wrote.
This commit is contained in:
Jacques Distler 2008-12-17 00:07:21 -06:00
parent a769ef7a84
commit a503e2b8ac
10 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/controllers/wiki_controller.rb
View file

@ -242,7 +242,14 @@ class WikiController < ApplicationController
begin
the_content = params['content']
filter_spam(the_content)
raise Instiki::ValidationError.new('Your content was not valid utf-8.') unless the_content.is_utf8?
unless the_content.is_utf8?
if @page
the_content = @page.content
else
the_content = ''
end
raise Instiki::ValidationError.new('Your content was not valid utf-8.')
end
if @page
wiki.revise_page(@web_name, @page_name, the_content, Time.now,
Author.new(author_name, remote_ip), PageRenderer.new)
@ -257,9 +264,9 @@ class WikiController < ApplicationController
logger.error e
if @page
@page.unlock
redirect_to :action => 'edit', :web => @web_name, :id => @page_name
redirect_to :action => 'edit', :web => @web_name, :id => @page_name, :content => the_content
else
redirect_to :action => 'new', :web => @web_name, :id => @page_name
redirect_to :action => 'new', :web => @web_name, :id => @page_name, :content => the_content
end
end
end