Permalink
Browse files

Simple changes to bring AWS up to date with view_paths and render :te…

…xt. Tests still fail though. [Koz]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7916 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 3397d97 commit ff4f90c81ad00241040c0c2ae2be1b937abfa063 @NZKoz NZKoz committed Oct 15, 2007
@@ -41,7 +41,7 @@ def dispatch_web_service_request
allowed_methods = self.class.web_service_api ? (self.class.web_service_api.allowed_http_methods || []) : [ :post ]
allowed_methods = allowed_methods.map{|m| m.to_s.upcase }
if !allowed_methods.include?(method)
- render_text("#{method} not supported", "500 #{method} not supported")
+ render :text => "#{method} not supported", :status=>500
return
end
exception = nil
@@ -101,7 +101,7 @@ def send_web_service_error_response(ws_request, exception)
message = "Exception raised"
backtrace = ""
end
- render_text("Internal protocol error: #{message}#{backtrace}", "500 Internal Protocol Error")
+ render :text => "Internal protocol error: #{message}#{backtrace}", :status => 500
end
end
@@ -158,7 +158,7 @@ def wsdl
log_error(e) unless logger.nil?
end
when :post
- render_text('POST not supported', '500 POST not supported')
+ render :text => 'POST not supported', :status => 500
end
end
@@ -109,15 +109,15 @@ def render_invocation_scaffold(action)
customized_template = "\#{self.class.controller_path}/#{action_name}/\#{action}"
default_template = scaffold_path(action)
if template_exists?(customized_template)
- content = @template.render_file(customized_template)
+ content = @template.render :file => customized_template
else
- content = @template.render_file(default_template, false)
+ content = @template.render :file => default_template
end
@template.instance_variable_set("@content_for_layout", content)
if self.active_layout.nil?
- render_file(scaffold_path("layout"))
+ render :file => scaffold_path("layout")
else
- render_file(self.active_layout, "200 OK", true)
+ render :file => self.active_layout
end
end
@@ -5,7 +5,7 @@
map.connect ':controller/:action/:id'
end
-ActionController::Base.view_load_paths = [ '.' ]
+ActionController::Base.view_paths = [ '.' ]
class ScaffoldPerson < ActionWebService::Struct
member :id, :int

0 comments on commit ff4f90c

Please sign in to comment.