Skip to content
Browse files

Merge changes from upstream

  • Loading branch information...
1 parent 3e2694e commit 3bdb4f31827661e61ef67eb3cd3a332ae9620d9d @lukaso lukaso committed Jul 26, 2012
Showing with 2 additions and 15 deletions.
  1. +2 −1 README.md
  2. +0 −1 lib/active_admin/mongoid.rb
  3. +0 −13 lib/active_admin/mongoid/form_builder.rb
View
3 README.md
@@ -52,7 +52,8 @@ rails/all includes elements requiring ActiveRecord::Connection ...
Execute:
$ bundle
- $ rails g devise:install
+ $ rails g devise:install
+ $ rails g active_admin:install
Check that the generated initializers/devise.rb file requires mongoid orm.
You may find a line like this :
View
1 lib/active_admin/mongoid.rb
@@ -13,7 +13,6 @@ def setup *args, &block
require 'active_admin/mongoid/adaptor'
require 'active_admin/mongoid/comments'
- require 'active_admin/mongoid/form_builder'
require 'active_admin/mongoid/filter_form_builder'
require 'active_admin/mongoid/resource'
require 'active_admin/mongoid/document'
View
13 lib/active_admin/mongoid/form_builder.rb
@@ -1,13 +0,0 @@
-require 'active_admin/form_builder'
-
-class ActiveAdmin::FormBuilder
- def inputs(*args, &block)
- # Store that we are creating inputs without a block
- @inputs_with_block = block_given? ? true : false
- content = with_new_form_buffer do
- super
- # form_buffers.last
- end
- form_buffers.last << content.html_safe
- end
-end

0 comments on commit 3bdb4f3

Please sign in to comment.
Something went wrong with that request. Please try again.