comfortable_mexican_sofa 1.5.7 → 1.5.8

data/VERSION

@@ -1 +1 @@
-1.5.7
+1.5.8

data/app/views/cms_admin/pages/_form_blocks.html.erb

@@ -1,4 +1,4 @@
-<% block_tags = @page.tags(true).select{ |t| t.is_cms_block? } %>
+<% block_tags = @page.tags(true).select{ |t| t.is_cms_block? }.uniq_by{|t| t.label} %>
 
 <div id='form_blocks'>
   <% if block_tags.empty? %>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfortable_mexican_sofa"
-  s.version = "1.5.7"
+  s.version = "1.5.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]
-  s.date = "2011-10-05"
+  s.date = "2011-10-06"
   s.description = ""
   s.email = "oleg@theworkinggroup.ca"
   s.extra_rdoc_files = [

data/test/functional/cms_admin/pages_controller_test.rb

@@ -162,6 +162,16 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     assert_response :success
   end
   
+  def test_get_new_with_repeated_tag
+    cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label}}{{cms:page:test_label}}')
+    get :new, :site_id => cms_sites(:default)
+    assert_response :success
+    assert_select "textarea[name='page[blocks_attributes][0][content]'][class='code']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='test_label']"
+    assert_select "textarea[name='page[blocks_attributes][1][content]'][class='code']", 0
+    assert_select "input[type='hidden'][name='page[blocks_attributes][1][label]'][value='test_label']", 0
+  end
+  
   def test_get_new_as_child_page
     get :new, :site_id => cms_sites(:default), :parent_id => cms_pages(:default)
     assert_response :success

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.5.7
+  version: 1.5.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-05 00:00:00.000000000Z
+date: 2011-10-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70320595035360 !ruby/object:Gem::Requirement
+  requirement: &70129752951400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70320595035360
+  version_requirements: *70129752951400
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70320595034880 !ruby/object:Gem::Requirement
+  requirement: &70129752950920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70320595034880
+  version_requirements: *70129752950920
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70320595034400 !ruby/object:Gem::Requirement
+  requirement: &70129752950440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70320595034400
+  version_requirements: *70129752950440
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -359,7 +359,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1509635901179194295
+      hash: 3954353601427756033
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: