wip

Oleg committed Aug 18, 2011
commit 4e262240849f4c07496ee9d68203365e30653c5c
Showing 3 changed files with 14 additions and 12 deletions
Gemfile +1 -1
@@ @@ -1,6 +1,6 @@
source 'http://rubygems.org'
- gem 'rails', '>=3.0.0'
+ gem 'rails', '>=3.1.0.rc5'
gem 'active_link_to', '>=1.0.0'
gem 'paperclip', '>=2.3.14'
app/controllers/cms_admin/files_controller.rb +12 -10
@@ @@ -2,33 +2,35 @@ class CmsAdmin::FilesController < CmsAdmin::BaseController
skip_before_filter :load_fixtures
- before_filter :build_file, :only => [:new, :create]
- before_filter :load_file, :only => [:edit, :update, :destroy]
+ before_filter :load_file, :only => [:edit, :update, :destroy]
def index
@files = @site.files
end
def new
- render
+ @file = @site.files.new
end
def create
- @file = @site.files.create!(:file => params[:file])
- render :partial => 'file', :object => @file
+ params[:file][:file].each do |file|
+ @site.files.create!(:file => file)
+ end
+
+ flash[:notice] = I18n.t('cms.files.created')
+ redirect_to :action => :index
rescue ActiveRecord::RecordInvalid
- render :nothing => true, :status => :bad_request
+ flash.now[:error] = I18n.t('cms.files.creation_failure')
+ render :action => :new
end
def destroy
@file.destroy
+ flash[:notice] = I18n.t('cms.files.deleted')
+ redirect_to :action => :index
end
protected
-
- def build_file
- @file = @site.files.new(params[:file])
- end
def load_file
@file = @site.files.find(params[:id])
app/views/cms_admin/files/_form.html.erb +1 -1
@@ @@ -1,4 +1,4 @@
-
+ <%= form.file_field :file, :multiple => true %>
<%= form.simple_field nil, nil, :class => 'submit_element' do %>
<%= form.submit t(@file.new_record?? '.create' : '.update'), :disable_builder => true %>