everything works
Oleg
committed Apr 16, 2011
commit 80f202a7f6306cb4c4e288d9d107f77606112513
Showing 7
changed files with
27 additions
and 25 deletions
app/models/cms/block.rb
+2
-0
| @@ | @@ -25,6 +25,8 @@ class Cms::Block < ActiveRecord::Base |
| :page => page | |
| ) | |
| end | |
| + | rescue => e |
| + | raise "WTF! #{e.to_s}" |
| end | |
| end | |
app/views/cms_admin/pages/_form_blocks.html.erb
+1
-1
| @@ | @@ -1,5 +1,5 @@ |
| <div id='form_blocks'> | |
| - | <%= fields_for :cms_blocks, :builder => ComfortableMexicanSofa::FormBuilder do |cms_blocks| %> |
| + | <%= fields_for :blocks, :builder => ComfortableMexicanSofa::FormBuilder do |cms_blocks| %> |
| <% @cms_page.tags(true).each do |tag| %> | |
| <%= cms_blocks.send(tag.class.name.underscore.downcase.idify, tag)%> | |
| <% end %> | |
config/environments/development.rb
+1
-1
| @@ | @@ -4,7 +4,7 @@ ComfortableMexicanSofa::Application.configure do |
| # In the development environment your application's code is reloaded on | |
| # every request. This slows down response time but is perfect for development | |
| # since you don't have to restart the webserver when you make code changes. | |
| - | config.cache_classes = false |
| + | config.cache_classes = true |
| # Log error messages when you accidentally call methods on nil. | |
| config.whiny_nils = true | |
migrate/02_upgrade_to_1_1_0.rb b/db/migrate/02_upgrade_to_1_1_0.rb
+0
-19
| @@ | @@ -1,19 +0,0 @@ |
| - | class UpgradeTo110 < ActiveRecord::Migration |
| - | def self.up |
| - | rename_column :cms_layouts, :cms_site_id, :site_id |
| - | rename_column :cms_pages, :cms_site_id, :site_id |
| - | rename_column :cms_pages, :cms_layout_id, :layout_id |
| - | rename_column :cms_blocks, :cms_page_id, :page_id |
| - | rename_column :cms_snippets, :cms_site_id, :site_id |
| - | rename_column :cms_uploads, :cms_site_id, :site_id |
| - | end |
| - | |
| - | def self.down |
| - | rename_column :cms_uploads, :site_id, :cms_site_id |
| - | rename_column :cms_snippets, :site_id, :cms_site_id |
| - | rename_column :cms_blocks, :page_id, :cms_page_id |
| - | rename_column :cms_layouts, :site_id, :cms_site_id |
| - | rename_column :cms_pages, :layout_id, :cms_layout_id |
| - | rename_column :cms_pages, :site_id, :cms_site_id |
| - | end |
| - | end |
| \ No newline at end of file | |
migrate/upgrades/02_upgrade_to_1_1_0.rb b/db/migrate/upgrades/02_upgrade_to_1_1_0.rb
+19
-0
| @@ | @@ -0,0 +1,19 @@ |
| + | class UpgradeTo110 < ActiveRecord::Migration |
| + | def self.up |
| + | rename_column :cms_layouts, :cms_site_id, :site_id |
| + | rename_column :cms_pages, :cms_site_id, :site_id |
| + | rename_column :cms_pages, :cms_layout_id, :layout_id |
| + | rename_column :cms_blocks, :cms_page_id, :page_id |
| + | rename_column :cms_snippets, :cms_site_id, :site_id |
| + | rename_column :cms_uploads, :cms_site_id, :site_id |
| + | end |
| + | |
| + | def self.down |
| + | rename_column :cms_uploads, :site_id, :cms_site_id |
| + | rename_column :cms_snippets, :site_id, :cms_site_id |
| + | rename_column :cms_blocks, :page_id, :cms_page_id |
| + | rename_column :cms_layouts, :site_id, :cms_site_id |
| + | rename_column :cms_pages, :layout_id, :cms_layout_id |
| + | rename_column :cms_pages, :site_id, :cms_site_id |
| + | end |
| + | end |
| \ No newline at end of file | |
comfortable_mexican_sofa/form_builder.rb b/lib/comfortable_mexican_sofa/form_builder.rb
+3
-3
| @@ | @@ -66,15 +66,15 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder |
| options[:content_field_method] ||= :text_field_tag | |
| field = | |
| options[:field] || | |
| - | @template.send(options[:content_field_method], 'cms_page[cms_blocks_attributes][][content]', tag.content, :id => nil, :class => field_css_class) |
| + | @template.send(options[:content_field_method], 'cms_page[blocks_attributes][][content]', tag.content, :id => nil, :class => field_css_class) |
| %( | |
| <div class='form_element #{css_class}'> | |
| <div class='label'>#{label}</div> | |
| <div class='value'> | |
| #{field} | |
| - | #{@template.hidden_field_tag('cms_page[cms_blocks_attributes][][label]', tag.label, :id => nil)} |
| - | #{@template.hidden_field_tag('cms_page[cms_blocks_attributes][][id]', tag.record_id, :id => nil) if tag.record_id} |
| + | #{@template.hidden_field_tag('cms_page[blocks_attributes][][label]', tag.label, :id => nil)} |
| + | #{@template.hidden_field_tag('cms_page[blocks_attributes][][id]', tag.record_id, :id => nil) if tag.record_id} |
| </div> | |
| </div> | |
| ).html_safe | |
public/javascripts/comfortable_mexican_sofa/cms.js
+1
-1
| @@ | @@ -54,7 +54,7 @@ $.CMS = function(){ |
| // Load Page Blocks on layout change | |
| load_page_blocks: function(){ | |
| - | $('select#cms_page_cms_layout_id').bind('change.cms', function() { |
| + | $('select#cms_page_layout_id').bind('change.cms', function() { |
| $.ajax({ | |
| url: ['/' + admin_path_prefix, 'pages', $(this).attr('data-page-id'), 'form_blocks'].join('/'), | |
| data: ({ | |