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

Fixing FileController#import; sort of works, but fails on some interesting tests

Browse source
This commit is contained in:
Alexey Verkhovsky 2006-03-23 07:14:51 +00:00
parent cb869abf0d
commit 64313ca208
5 changed files with 32 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/application.rb
View file

@ -2,7 +2,7 @@
# Likewise will all the methods added be available for all controllers.
class ApplicationController < ActionController::Base
before_filter :connect_to_model, :check_authorization, :setup_url_generator, :set_content_type_header, :set_robots_metatag
before_filter :fetch_model_data, :check_authorization, :setup_url_generator, :set_content_type_header, :set_robots_metatag
after_filter :remember_location, :teardown_url_generator
# For injecting a different wiki model implementation. Intended for use in tests
@ -19,7 +19,7 @@ class ApplicationController < ActionController::Base
end
protected
def check_authorization
if in_a_web? and authorization_needed? and not authorized?
redirect_to :controller => 'wiki', :action => 'login', :web => @web_name
@ -27,18 +27,18 @@ class ApplicationController < ActionController::Base
end
end
def connect_to_model
def fetch_model_data
@action_name = @params['action'] || 'index'
@web_name = @params['web']
@wiki = wiki
@author = cookies['author'] || 'AnonymousCoward'
if @web_name
@web = @wiki.webs[@web_name]
if @web.nil?
render :status => 404, :text => "Unknown web '#{@web_name}'"
return false
render(:status => 404, :text => "Unknown web '#{@web_name}'")
return false
end
end
@author = cookies['author'] || 'AnonymousCoward'
end
FILE_TYPES = {