Merge remote-tracking branch 'jpmckinney/master'

fixes #13

lib/active_admin/mongoid.rb

@@ -1,4 +1,5 @@
 require 'active_admin'
+require 'mongoid'
 
 module ActiveAdmin
   module Mongoid

lib/active_admin/mongoid/document.rb

@@ -1,5 +1,3 @@
-require 'mongoid'
-
 module ActiveAdmin::Mongoid::Document
   extend ActiveSupport::Concern
 

lib/active_admin/mongoid/resource.rb

@@ -1,6 +1,3 @@
-require 'active_admin'
-require 'inherited_resources'
-
 ActiveAdmin::Resource # autoload
 class ActiveAdmin::Resource
   def resource_table_name
@@ -14,15 +11,16 @@ class ActiveAdmin::ResourceController
 
   protected
 
+  # @todo remove once https://github.com/gregbell/active_admin/pull/1454 is merged
   def skip_sidebar!
     @skip_sidebar = true
   end
 
   # Use #desc and #asc for sorting.
   def sort_order(chain)
     params[:order] ||= active_admin_config.sort_order
-    table_name = active_admin_config.resource_table_name
-    if params[:order] && params[:order] =~ /^([\w\_\.]+)_(desc|asc)$/
+    # @todo remove once https://github.com/mongoid/mongoid/pull/2175 is fixed
+    if params[:order] && params[:order] != 'id_desc' && params[:order] =~ /^([\w\_\.]+)_(desc|asc)$/
       chain.send($2, $1)
     else
       chain # just return the chain