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

More user-friendly error handling in admin/create_web

Browse source
This commit is contained in:
Alexey Verkhovsky 2005-03-26 00:09:41 +00:00
parent d330c02186
commit b333e0797c
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/admin_controller.rb
View file

@ -19,7 +19,7 @@ class AdminController < ApplicationController
Your new wiki '#{@params['web_name']}' is created!<br/> Your new wiki '#{@params['web_name']}' is created!<br/>
Please edit its home page and press Submit when finished. Please edit its home page and press Submit when finished.
EOL EOL
redirect_to :web => @params['web_address'], :controller => 'wiki', :action => 'new', redirect_to :web => @params['web_address'], :controller => 'wiki', :action => 'new',
:id => 'HomePage' :id => 'HomePage'
else else
# no form submitted -> go to template # no form submitted -> go to template
@ -30,8 +30,14 @@ class AdminController < ApplicationController
if @params['address'] if @params['address']
# form submitted # form submitted
if @wiki.authenticate(@params['system_password']) if @wiki.authenticate(@params['system_password'])
@wiki.create_web(@params['name'], @params['address']) begin
redirect_show('HomePage', @params['address']) @wiki.create_web(@params['name'], @params['address'])
flash[:info] = "New web '#{@params['name']}' successfully created."
redirect_to :web => @params['address'], :controller => 'wiki', :action => 'new',
:id => 'HomePage'
rescue Instiki::ValidationError => e
flash[:error] = e.message
end
else else
redirect_to :controller => 'wiki', :action => 'index' redirect_to :controller => 'wiki', :action => 'index'
end end