aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/generators/erb
diff options
context:
space:
mode:
Diffstat (limited to 'railties/lib/generators/erb')
-rw-r--r--railties/lib/generators/erb/controller/controller_generator.rb2
-rw-r--r--railties/lib/generators/erb/mailer/mailer_generator.rb4
-rw-r--r--railties/lib/generators/erb/scaffold/scaffold_generator.rb5
3 files changed, 6 insertions, 5 deletions
diff --git a/railties/lib/generators/erb/controller/controller_generator.rb b/railties/lib/generators/erb/controller/controller_generator.rb
index 706c92cb91..ab7b273662 100644
--- a/railties/lib/generators/erb/controller/controller_generator.rb
+++ b/railties/lib/generators/erb/controller/controller_generator.rb
@@ -6,7 +6,7 @@ module Erb
argument :actions, :type => :array, :default => [], :banner => "action action"
def create_view_files
- base_path = File.join('app', 'views', class_path, file_name)
+ base_path = File.join("app/views", class_path, file_name)
empty_directory base_path
actions.each do |action|
diff --git a/railties/lib/generators/erb/mailer/mailer_generator.rb b/railties/lib/generators/erb/mailer/mailer_generator.rb
index 398ab46dd8..4ec2f4c9f4 100644
--- a/railties/lib/generators/erb/mailer/mailer_generator.rb
+++ b/railties/lib/generators/erb/mailer/mailer_generator.rb
@@ -6,13 +6,13 @@ module Erb
argument :actions, :type => :array, :default => [], :banner => "method method"
def create_view_folder
- empty_directory File.join("app", "views", file_path)
+ empty_directory File.join("app/views", file_path)
end
def create_view_files
actions.each do |action|
@action, @path = action, File.join(file_path, action)
- template "view.erb", File.join("app", "views", "#{@path}.erb")
+ template "view.erb", File.join("app/views", "#{@path}.erb")
end
end
end
diff --git a/railties/lib/generators/erb/scaffold/scaffold_generator.rb b/railties/lib/generators/erb/scaffold/scaffold_generator.rb
index c89af042b7..c8723785f4 100644
--- a/railties/lib/generators/erb/scaffold/scaffold_generator.rb
+++ b/railties/lib/generators/erb/scaffold/scaffold_generator.rb
@@ -28,13 +28,14 @@ module Erb
# TODO invoke_if?
def copy_layout_file
- template "layout.html.erb", File.join("app", "views", "layouts", controller_class_path, "#{controller_file_name}.html.erb")
+ template "layout.html.erb",
+ File.join("app/views/layouts", controller_class_path, "#{controller_file_name}.html.erb")
end
protected
def copy_view(view)
- template "#{view}.html.erb", File.join("app", "views", controller_file_path, "#{view}.html.erb")
+ template "#{view}.html.erb", File.join("app/views", controller_file_path, "#{view}.html.erb")
end
end