rails_admin 0.0.2 → 0.0.3

data/app/assets/stylesheets/rails_admin/imports.css.scss.erb

@@ -54,7 +54,7 @@
 @import "bootstrap/tooltip";
 @import "bootstrap/popovers";
 @import "bootstrap/thumbnails";
-@import "bootstrap/labels";
+@import "bootstrap/labels-badges";
 @import "bootstrap/progress-bars";
 @import "bootstrap/accordion";
 @import "bootstrap/carousel";

data/app/views/rails_admin/main/index.html.haml

@@ -131,7 +131,7 @@
               %td.other.right= link_to "...", @other_right_link, :class => 'pjax'
             %td.last.links
               %ul.inline= menu_for :member, @abstract_model, object, true
-    - unless params[:all]
+    - if @objects.respond_to?(:total_count)
       - total_count = @objects.total_count
       = paginate(@objects, :theme => 'twitter-bootstrap', :remote => true)
       = link_to(t("admin.misc.show_all"), index_path(params.merge(:all => true)), :class => "show-all btn clearfix pjax") unless total_count > 100 || total_count <= @objects.to_a.size

data/lib/rails_admin/version.rb

@@ -1,3 +1,3 @@
 module RailsAdmin
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/dummy_app/app/active_record/team.rb

@@ -5,7 +5,7 @@ class Team < ActiveRecord::Base
   attr_accessible :name, :division_id, :logo_url, :manager, :ballpark, :mascot, :founded, :wins, :losses, :win_percentage, :revenue, :color, :custom_field, :fan_ids, :player_ids, :comment_ids
 
   belongs_to :division
-  has_many :players, :inverse_of => :team
+  has_many :players, :inverse_of => :team, :order => :id
   has_and_belongs_to_many :fans
   has_many :comments, :as => :commentable
 

data/spec/integration/basic/list/rails_admin_basic_list_spec.rb

@@ -313,6 +313,16 @@ describe "RailsAdmin Basic List" do
     it "should respond successfully" do
       2.times.map { FactoryGirl.create :player }
       visit index_path(:model_name => "player", :all => true)
+      find('div.total-count').should have_content("2 players")
+    end
+  end
+
+  describe "GET /admin/player show with pagination disabled by :associated_collection" do
+    it "should respond successfully" do
+      @team = FactoryGirl.create :team
+      2.times.map { FactoryGirl.create :player, :team => @team }
+      visit index_path(:model_name => "player", :associated_collection => "players", :compact => true, :current_action => 'update', :source_abstract_model => 'team', :source_object_id => @team.id)
+      find('div.total-count').should have_content("2 players")
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-10 00:00:00.000000000 Z
+date: 2012-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bbenezech-nested_form
@@ -560,7 +560,6 @@ files:
 - config/initializers/haml.rbc
 - config/initializers/mongoid_extensions.rb
 - config/initializers/mongoid_extensions.rbc
-- config/locales/fr.yml
 - config/locales/rails_admin.en.yml
 - config/routes.rb
 - config/routes.rbc
@@ -855,6 +854,7 @@ files:
 - spec/dummy_app/config/initializers/session_store.rbc
 - spec/dummy_app/config/initializers/wrap_parameters.rb
 - spec/dummy_app/config/initializers/wrap_parameters.rbc
+- spec/dummy_app/config/locales/fr.yml
 - spec/dummy_app/config/mongoid.yml
 - spec/dummy_app/config/routes.rb
 - spec/dummy_app/config/routes.rbc
@@ -1155,6 +1155,7 @@ test_files:
 - spec/dummy_app/config/initializers/session_store.rbc
 - spec/dummy_app/config/initializers/wrap_parameters.rb
 - spec/dummy_app/config/initializers/wrap_parameters.rbc
+- spec/dummy_app/config/locales/fr.yml
 - spec/dummy_app/config/mongoid.yml
 - spec/dummy_app/config/routes.rb
 - spec/dummy_app/config/routes.rbc