From d0d30e767d7e9a61ec1d8b8d44894f0ab508b990 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 3 Nov 2010 20:12:08 +0100
Subject: Fix scaffold generator to be aware of namespace in isolated engine

---
 railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb | 2 ++
 railties/lib/rails/generators/erb/scaffold/templates/edit.html.erb  | 2 ++
 railties/lib/rails/generators/erb/scaffold/templates/index.html.erb | 2 ++
 railties/lib/rails/generators/erb/scaffold/templates/new.html.erb   | 2 ++
 railties/lib/rails/generators/erb/scaffold/templates/show.html.erb  | 2 ++
 5 files changed, 10 insertions(+)

(limited to 'railties/lib/rails/generators/erb/scaffold')

diff --git a/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
index d12b2ff0e5..c8ee939ad7 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
+++ b/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb
@@ -1,3 +1,4 @@
+<% without_namespacing do -%>
 <%%= form_for(@<%= singular_table_name %>) do |f| %>
   <%% if @<%= singular_table_name %>.errors.any? %>
     <div id="error_explanation">
@@ -21,3 +22,4 @@
     <%%= f.submit %>
   </div>
 <%% end %>
+<% end -%>
diff --git a/railties/lib/rails/generators/erb/scaffold/templates/edit.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/edit.html.erb
index e58b9fbd08..d1bfcbc429 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/edit.html.erb
+++ b/railties/lib/rails/generators/erb/scaffold/templates/edit.html.erb
@@ -1,6 +1,8 @@
+<% without_namespacing do -%>
 <h1>Editing <%= singular_table_name %></h1>
 
 <%%= render 'form' %>
 
 <%%= link_to 'Show', @<%= singular_table_name %> %> |
 <%%= link_to 'Back', <%= index_helper %>_path %>
+<% end -%>
diff --git a/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb
index 4c46db4d67..435d126ee4 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb
+++ b/railties/lib/rails/generators/erb/scaffold/templates/index.html.erb
@@ -1,3 +1,4 @@
+<% without_namespacing do -%>
 <h1>Listing <%= plural_table_name %></h1>
 
 <table>
@@ -25,3 +26,4 @@
 <br />
 
 <%%= link_to 'New <%= human_name %>', new_<%= singular_table_name %>_path %>
+<% end -%>
diff --git a/railties/lib/rails/generators/erb/scaffold/templates/new.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/new.html.erb
index 02ae4d015e..fe4d0971c4 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/new.html.erb
+++ b/railties/lib/rails/generators/erb/scaffold/templates/new.html.erb
@@ -1,5 +1,7 @@
+<% without_namespacing do -%>
 <h1>New <%= singular_table_name %></h1>
 
 <%%= render 'form' %>
 
 <%%= link_to 'Back', <%= index_helper %>_path %>
+<% end -%>
diff --git a/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb b/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb
index c0e5ccff1e..bc3a87b99f 100644
--- a/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb
+++ b/railties/lib/rails/generators/erb/scaffold/templates/show.html.erb
@@ -1,3 +1,4 @@
+<% without_namespacing do -%>
 <p id="notice"><%%= notice %></p>
 
 <% for attribute in attributes -%>
@@ -10,3 +11,4 @@
 
 <%%= link_to 'Edit', edit_<%= singular_table_name %>_path(@<%= singular_table_name %>) %> |
 <%%= link_to 'Back', <%= index_helper %>_path %>
+<% end -%>
-- 
cgit v1.2.3