Merge pull request #696 from melvinsembrano/selected-category-on-file-upload

Automatically assign uploaded files to currently selected category

Author: GBH

app/controllers/comfy/admin/cms/files_controller.rb

@@ -40,6 +40,7 @@ def new
   end
 
   def create
+    @file.category_ids = @site.categories.where(label: params[:category]).inject({}) {|hash, category| hash.merge category.id => 1} if params[:category]
     @file.save!
 
     case params[:source]

app/views/comfy/admin/cms/files/index.html.haml

@@ -24,7 +24,7 @@
 :javascript
   $(function(){
     window.CMS.uploader($("#cms-uploader"), {
-      url: '#{comfy_admin_cms_site_files_path(@site, :source => :plupload)}',
+      url: '#{comfy_admin_cms_site_files_path(@site, :source => :plupload, :category => params[:category])}',
       multipart_params: {
         '#{request_forgery_protection_token}': '#{form_authenticity_token}',
         '#{Rails.application.config.session_options[:key]}': '#{request.session_options[:id]}'

test/controllers/comfy/admin/cms/files_controller_test.rb

@@ -215,4 +215,19 @@ def test_reorder
     assert_equal 1, file_one.position
     assert_equal 0, file_two.position
   end
+
+  def test_create_as_plupload_with_selected_category
+    assert_difference 'Comfy::Cms::File.count' do
+      post :create,
+        :source   => 'plupload',
+        :site_id  => @site,
+        :file     => {
+          :file => fixture_file_upload('files/image.jpg', 'image/jpeg')
+        },
+        :category => [comfy_cms_categories(:default).label]
+      assert_response :success
+      assert_no_select "body"
+      assert_select "tr[id=comfy_cms_file_#{Comfy::Cms::File.last.id}] .category", comfy_cms_categories(:default).label
+    end
+  end
 end