diff --git a/Gemfile b/Gemfile index dba94f5..5fb098f 100644 --- a/Gemfile +++ b/Gemfile @@ -46,6 +46,7 @@ group :test do gem 'rspec', '~> 2.14.0' gem 'rspec-rails', '~> 2.14.1' gem 'mocha', '~> 1.1.0', :require => false + gem 'spring' gem 'test-unit' if RUBY_VERSION >= '2.2.0' gem 'minitest' gem 'minitest-reporters' diff --git a/app/helpers/folder_helper.rb b/app/helpers/folder_helper.rb index a1b43d0..bbe9b4e 100644 --- a/app/helpers/folder_helper.rb +++ b/app/helpers/folder_helper.rb @@ -6,8 +6,7 @@ module FolderHelper configure[:recursive] ||= false configure[:list_type] ||= :folder if !configure[:contents].blank? - configure[:contents] = configure[:contents].paginate( - :order => "name ASC", + configure[:contents] = configure[:contents].order('name ASC').paginate( :per_page => 30, :page => params[:npage] ) diff --git a/app/models/add_member.rb b/app/models/add_member.rb index bd20dfb..be454d7 100644 --- a/app/models/add_member.rb +++ b/app/models/add_member.rb @@ -8,7 +8,7 @@ class AddMember < Task alias :organization :target alias :organization= :target= - settings_items :roles + settings_items :roles, type: Array after_create do |task| remove_from_suggestion_list(task) diff --git a/app/models/blog_archives_block.rb b/app/models/blog_archives_block.rb index 30687af..d36ddad 100644 --- a/app/models/blog_archives_block.rb +++ b/app/models/blog_archives_block.rb @@ -33,10 +33,10 @@ class BlogArchivesBlock < Block results = '' posts = visible_posts(args[:person]) posts.except(:order).count(:all, :group => 'EXTRACT(YEAR FROM published_at)').sort_by {|year, count| -year.to_i}.each do |year, count| - results << content_tag('li', content_tag('strong', "#{year} (#{count})")) - results << "