Changeset 7916
- Timestamp:
- 10/15/07 08:59:48 (11 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
r6037 r7916 42 42 allowed_methods = allowed_methods.map{|m| m.to_s.upcase } 43 43 if !allowed_methods.include?(method) 44 render _text("#{method} not supported", "500 #{method} not supported")44 render :text => "#{method} not supported", :status=>500 45 45 return 46 46 end … … 102 102 backtrace = "" 103 103 end 104 render _text("Internal protocol error: #{message}#{backtrace}", "500 Internal Protocol Error")104 render :text => "Internal protocol error: #{message}#{backtrace}", :status => 500 105 105 end 106 106 end … … 159 159 end 160 160 when :post 161 render _text('POST not supported', '500 POST not supported')161 render :text => 'POST not supported', :status => 500 162 162 end 163 163 end trunk/actionwebservice/lib/action_web_service/scaffolding.rb
r6180 r7916 110 110 default_template = scaffold_path(action) 111 111 if template_exists?(customized_template) 112 content = @template.render _file(customized_template)112 content = @template.render :file => customized_template 113 113 else 114 content = @template.render _file(default_template, false)114 content = @template.render :file => default_template 115 115 end 116 116 @template.instance_variable_set("@content_for_layout", content) 117 117 if self.active_layout.nil? 118 render _file(scaffold_path("layout"))118 render :file => scaffold_path("layout") 119 119 else 120 render _file(self.active_layout, "200 OK", true)120 render :file => self.active_layout 121 121 end 122 122 end trunk/actionwebservice/test/scaffolded_controller_test.rb
r6180 r7916 6 6 end 7 7 8 ActionController::Base.view_ load_paths = [ '.' ]8 ActionController::Base.view_paths = [ '.' ] 9 9 10 10 class ScaffoldPerson < ActionWebService::Struct
