app/views/admin/galleries/follow_import.html.erb @@ -88,7 +88,8 @@ class Admin::GalleriesController < Admin::BaseController @gallery.save! @gallery.insert_pictures(params[:directory]) # TODO: With mass_upload new system manage the progress bar - redirect_to admin_gallery_url(@gallery) + #redirect_to admin_gallery_url(@gallery) + redirect_to :action => 'follow_import' else flash[:notice] = 'the directory is not a directory' render :action => 'new' @@ -99,6 +100,7 @@ class Admin::GalleriesController < Admin::BaseController # See the following of mass_upload def follow_import - + @imports = Import.find(:all).group_by(&:gallery) + redirect_to :action => 'index' if @imports.empty? end end app/controllers/admin/galleries_controller.rb @@ -1,4 +1,5 @@ class Import < ActiveRecord::Base belongs_to :gallery + end app/models/import.rb @@ -5,7 +5,7 @@ class Picture < ActiveRecord::Base has_attachment :content_type => :image, :storage => :file_system, - :max_size => 1.megabytes, + :max_size => 10.megabytes, :resize_to => "#{Setting.default.picture_max_width}x#{Setting.default.picture_max_height}>", :path_prefix => 'public/pictrails_pictures', :thumbnail_class => Thumbnail, app/models/picture.rb @@ -43,6 +43,10 @@ ActionController::Routing::Routes.draw do |map| #Resources for settings admin.connect 'settings/delete_cache', :controller => 'settings', :action => 'delete_cache' admin.resources :settings + + # TODO: See a better system by resources + admin.mass_upload '/galleries/mass_upload', :controller => 'galleries', :action => 'mass_upload' + admin.follow_redirect '/galleries/follow_import', :controller => 'galleries', :action => 'follow_import' #Resources of gallerie admin.resources :galleries do |gallery| @@ -52,7 +56,6 @@ ActionController::Routing::Routes.draw do |map| :action => 'show', :page => /\d+/ - admin.mass_upload '/galleries/mass_upload', :controller => 'galleries', :action => 'mass_upload' # particular route admin.login '/login', :controller => 'sessions', :action => 'new' @@ -61,6 +64,7 @@ ActionController::Routing::Routes.draw do |map| # Default page in this namespace admin.root :controller => 'galleries' + end map.root :controller => 'galleries' config/routes.rb @@ -985,3 +985,22 @@ li.paginate { .pagination a { text-decoration : underline; } + +table.progress { + width: 40em; + border: 1px solid #D7D7D7; + border-collapse: collapse; + border-spacing: 0pt; + empty-cells: show; + text-align: center; + float:left; + margin: 1px 6px 1px 0px; +} + +table.progress td { + height: 0.9em; +} + +td.made { + background : #BAE0BA none repeat scroll 0% 50%; +} public/stylesheets/administration.css @@ -141,7 +141,7 @@ describe Admin::GalleriesController, 'with user logged and no import' do @gallery.should_receive(:save!).once.and_return(true) @gallery.should_receive(:insert_pictures).once.with(directory) post 'mass_upload', :directory => directory - response.should redirect_to(admin_gallery_url(@gallery)) + response.should redirect_to(:action => 'follow_import') end it 'should not add gallery by mass_upload with a bad directory' do @@ -161,4 +161,10 @@ describe Admin::GalleriesController, 'with user logged and no import' do response.should render_template('new') end + it 'should redirect in follow_import if no import' do + Import.delete_all + get 'follow_import' + response.should redirect_to(:action => 'index') + end + end spec/controllers/admin/galleries_controller_spec.rb @@ -4,6 +4,7 @@ Story: Add a Gallery and Picture Scenario: Add a gallery after login Given there are no user save And there are no gallery save + And there are no picture save And a username 'shingara' And a password 'shin' And an email 'cyril.mougel@gmail.com' stories/add_gallery_story 0c7c1ba4d958656d952bdf80be63acfc466877f5 shingara cyril.mougel@gmail.com http://github.com/shingara/pictrails/commit/ec539303cdfde2c0c16853ad99c16fc4be549284 ec539303cdfde2c0c16853ad99c16fc4be549284 2008-04-30T15:00:29-07:00 2008-04-30T15:00:29-07:00 Add a view of progress in mass_upload 7422b9b0bac2e250acb63137c80c68f4cb125c97 shingara cyril.mougel@gmail.com