express_admin 1.7.29 → 1.7.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef8cec8a16d8b19753bb84b13648532cf14f696f
-  data.tar.gz: 47d9fe386d1018d71caa8548da23340b16f92c18
+  metadata.gz: d82b87132256121784e3e892a5a0d3aaaad7e4e9
+  data.tar.gz: 3ef8d6949a69b5e92cb3f39f6ac085bc0829a0e5
 SHA512:
-  metadata.gz: fe38c39fc5686864203803f68ae1611a89c324bac1c96411d1cb1961fc06511463b176b54bd64396fda049ae43f8078fcda8f872d02ed247322b48ae4bdc1321
-  data.tar.gz: 4d38dd9c209e8f3149ad44d9cd4110fdc22c5615518b9c3bf0bac949181d368559cdc9331ee69923bd10397c46d66316aeadca0039a348a40fd0875b05e01413
+  metadata.gz: f02135bc0897a255a969b7087e1082bdafa587767780575f98948f7d2c8cfc948e840025ec28046ae3e6e953573634dab138882ec8db5e6e21392353c1b7c33a
+  data.tar.gz: 52b48b4e451a52e14d5b9df7dda7605b81361030fa0e524533b7842dae327d323d1fe73130d63f1c564583853c55c5f8e17ce66c5f8ef4e062439a701137f82c

data/lib/express_admin/standard_actions.rb

@@ -237,11 +237,15 @@ module ExpressAdmin
                   else
                     resource_class
                   end
-          filtered_scope = filter(scope)  # TODO: Removed the conditionally invoked .all
+          filtered_scope = filter(ordered_scope(scope))  # TODO: Removed the conditionally invoked .all
           # scope = params[:asc] || params[:desc] ? sort_table(scope) : scope
           self.instance_variable_set(collection_ivar, filtered_scope)
         end
 
+        def ordered_scope(scope)
+          scope
+        end
+
         def filter(scope)
           if _filter_field
             scope.kind_of?(Array) ? _array_filter(scope) : _sql_filter(scope)

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.7.29"
+  VERSION = "1.7.30"
 end

data/test/controllers/standard_controller_test.rb

@@ -67,7 +67,7 @@ module ExpressAdmin
     test "#index should expose a collection of resources" do
       widgets_controller.index
       assert collection, "@widgets not provided by #index"
-      refute collection.empty?, "@widgets is empty"
+      refute collection.all.empty?, "@widgets is empty"
     end
 
     test "#edit should expose an instance of resource if found" do

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150812073447) do
+ActiveRecord::Schema.define(version: 20150928044202) do
 
   create_table "categories", force: :cascade do |t|
     t.string   "name"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: express_admin
 version: !ruby/object:Gem::Version
-  version: 1.7.29
+  version: 1.7.30
 platform: ruby
 authors:
 - Steven Talcott Smith