diff options
| author | Michael Koziarski <michael@koziarski.com> | 2007-10-15 08:59:48 +0000 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2007-10-15 08:59:48 +0000 |
| commit | ff4f90c81ad00241040c0c2ae2be1b937abfa063 (patch) | |
| tree | 3157ea8127e278ed2990fddc450e610de98c2f96 /actionwebservice/lib/action_web_service/scaffolding.rb | |
| parent | 3397d971ffbeb3870d4223fabcb85cd97a9d79a9 (diff) | |
| download | rails-ff4f90c81ad00241040c0c2ae2be1b937abfa063.tar.gz rails-ff4f90c81ad00241040c0c2ae2be1b937abfa063.tar.bz2 rails-ff4f90c81ad00241040c0c2ae2be1b937abfa063.zip | |
Simple changes to bring AWS up to date with view_paths and render :text. Tests still fail though. [Koz]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7916 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionwebservice/lib/action_web_service/scaffolding.rb')
| -rw-r--r-- | actionwebservice/lib/action_web_service/scaffolding.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionwebservice/lib/action_web_service/scaffolding.rb b/actionwebservice/lib/action_web_service/scaffolding.rb index 1ffe4eba77..f94a7ee916 100644 --- a/actionwebservice/lib/action_web_service/scaffolding.rb +++ b/actionwebservice/lib/action_web_service/scaffolding.rb @@ -109,15 +109,15 @@ module ActionWebService 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 |