comfortable_mexican_sofa 1.8.4 → 1.8.5

data/app/controllers/cms_admin/files_controller.rb

@@ -9,9 +9,17 @@ class CmsAdmin::FilesController < CmsAdmin::BaseController
     @files = @site.files.includes(:categories).for_category(params[:category]).order('cms_files.position')
     
     if params[:ajax]
-      files = @files.images.collect do |file|
-        { :thumb  => file.file.url(:cms_thumb),
-          :image  => file.file.url }
+      if params[:not_images]
+        files = @files.not_images.collect do |file|
+          { :label    => file.label,
+            :filename => file.file_file_name,
+            :url      => file.file.url }
+        end
+      else
+        files = @files.images.collect do |file|
+          { :thumb  => file.file.url(:cms_thumb),
+            :image  => file.file.url }
+        end
       end
       render :json => files
     else
@@ -47,7 +55,7 @@ class CmsAdmin::FilesController < CmsAdmin::BaseController
     
     if params[:ajax]
       view = render_to_string(:partial => 'cms_admin/files/file', :collection => @files, :layout => false)
-      render :json => {:filelink => @file.file.url, :view => view.gsub("\n", '')}
+      render :json => {:filelink => @file.file.url, :filename => @file.file_file_name, :view => view.gsub("\n", '')}
     else
       flash[:success] = I18n.t('cms.files.created')
       redirect_to :action => :edit, :id => @file

data/app/controllers/cms_admin/pages_controller.rb

@@ -106,7 +106,7 @@ protected
       @cms_site   = @page.site
       @cms_layout = @page.layout
       @cms_page   = @page
-      render :inline => @page.content(true), :layout => layout
+      render :inline => @page.content(true), :layout => layout, :content_type => 'text/html'
     end
   end
 end

data/lib/comfortable_mexican_sofa/version.rb

@@ -1,3 +1,3 @@
 module ComfortableMexicanSofa
-  VERSION = "1.8.4"
+  VERSION = "1.8.5"
 end

data/test/functional/cms_admin/files_controller_test.rb

@@ -41,7 +41,20 @@ class CmsAdmin::FilesControllerTest < ActionController::TestCase
       'image' => file.file.url
     }], r
   end
-  
+
+  def test_get_index_as_ajax_with_no_images
+    file = cms_files(:default)
+    file.update_attribute(:file_content_type, 'text/plain')
+    get :index, :site_id => cms_sites(:default), :not_images => 1, :ajax => true
+    assert_response :success
+    r = JSON.parse(response.body)
+    assert_equal [{
+      'label'    => file.label,
+      'filename' => file.file_file_name,
+      'url'      => file.file.url
+    }], r
+  end
+
   def test_get_new
     site = cms_sites(:default)
     get :new, :site_id => site
@@ -133,6 +146,7 @@ class CmsAdmin::FilesControllerTest < ActionController::TestCase
       file = Cms::File.last
       r = JSON.parse(response.body)
       assert_equal file.file.url, r['filelink']
+      assert_equal file.file_file_name, r['filename']
       assert_present r['view']
     end
   end

data/test/functional/cms_admin/pages_controller_test.rb

@@ -370,6 +370,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
       }
       assert_response :success
       assert_match /preview content/, response.body
+      assert_equal 'text/html', response.content_type
       
       assert_equal site, assigns(:cms_site)
       assert_equal layout, assigns(:cms_layout)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails