Making it kinda work in Rails 3.1. Still need to figure out css/js asset system

Oleg committed May 02, 2011
commit 8b517ff9885b9672c0e342f05c21afbaa49a3047
Showing 4 changed files with 4 additions and 4 deletions
app/views/cms_admin/pages/_form_blocks.html.erb +1 -1
@@ @@ -1,5 +1,5 @@
<div id='form_blocks'>
- <%= fields_for :blocks, :builder => ComfortableMexicanSofa::FormBuilder do |cms_blocks| %>
+ <%= fields_for :blocks, nil, :builder => ComfortableMexicanSofa::FormBuilder do |cms_blocks| %>
<% @cms_page.tags(true).select{|t| t.is_cms_block?}.each do |tag| %>
<%= cms_blocks.send(tag.class.to_s.demodulize.underscore, tag)%>
<% end %>
config/environments/development.rb +1 -1
@@ @@ -1,4 +1,4 @@
- ComfortableMexicanSofa::Application.configure do
+ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Application.configure do
# Settings specified here will take precedence over those in config/environment.rb
# In the development environment your application's code is reloaded on
config/environments/production.rb +1 -1
@@ @@ -1,4 +1,4 @@
- ComfortableMexicanSofa::Application.configure do
+ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Application.configure do
# Settings specified here will take precedence over those in config/environment.rb
# The production environment is meant for finished, "live" apps.
config/environments/test.rb +1 -1
@@ @@ -1,4 +1,4 @@
- ComfortableMexicanSofa::Application.configure do
+ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Application.configure do
# Settings specified here will take precedence over those in config/environment.rb
# The test environment is used exclusively to run your application's