comfortable_mexican_sofa 1.4.2 → 1.4.3

data/VERSION

@@ -1 +1 @@
-1.4.2
+1.4.3

data/app/assets/javascripts/comfortable_mexican_sofa/application.js

@@ -59,9 +59,9 @@ $.CMS = function(){
 
     // Load Page Blocks on layout change
     load_page_blocks: function(){
-      $('select#cms_page_layout_id').bind('change.cms', function() {
+      $('select#page_layout_id').bind('change.cms', function() {
         $.ajax({
-          url: ['/' + admin_path_prefix, 'pages', $(this).attr('data-page-id'), 'form_blocks'].join('/'),
+          url: $(this).data('url'),
           data: ({
             layout_id: $(this).val()
           }),

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

@@ -16,7 +16,7 @@
     <%= form.text_field :slug, :id => 'slug' %>
   <% end %>
   <% if (options = Cms::Layout.options_for_select(@site)).present? %>
-    <%= form.select :layout_id, options, {}, 'data-page-id' => @page.id.to_i, :label => 'Layout' %>
+    <%= form.select :layout_id, options, {}, 'data-url' => form_blocks_cms_admin_site_page_path(@site, @page.id.to_i), :label => 'Layout' %>
   <% end %>
   <% if (options = Cms::Page.options_for_select(@site, @page)).present? %>
     <%= form.select :parent_id, options %>

data/comfortable_mexican_sofa.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.4.2"
+  s.version = "1.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]

data/test/functional/cms_admin/pages_controller_test.rb

@@ -42,6 +42,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     assert_equal cms_layouts(:default), assigns(:page).layout
     assert_template :new
     assert_select "form[action=/cms-admin/sites/#{site.id}/pages]"
+    assert_select "select[data-url=/cms-admin/sites/#{site.id}/pages/0/form_blocks]"
   end
 
   def test_get_new_with_field_datetime
@@ -122,6 +123,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     assert assigns(:page)
     assert_template :edit
     assert_select "form[action=/cms-admin/sites/#{page.site.id}/pages/#{page.id}]"
+    assert_select "select[data-url=/cms-admin/sites/#{page.site.id}/pages/#{page.id}/form_blocks]"
   end
 
   def test_get_edit_failure

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70159786788480 !ruby/object:Gem::Requirement
+  requirement: &70185365145420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70159786788480
+  version_requirements: *70185365145420
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70159786786900 !ruby/object:Gem::Requirement
+  requirement: &70185365144940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70159786786900
+  version_requirements: *70185365144940
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70159786785480 !ruby/object:Gem::Requirement
+  requirement: &70185365144460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,7 +45,7 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70159786785480
+  version_requirements: *70185365144460
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -344,7 +344,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2300960589873991041
+      hash: -4262236515429772675
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: