activeadmin 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 842a8c9499f04c81ff55eec25e730a6a3b4200b3
-  data.tar.gz: aa2c77337e5e893d15ee1de11b2f39dff75038ee
+  metadata.gz: 45c6ee86f21893e01b4a7da95f87eff301071cd6
+  data.tar.gz: 40ab9df25f437e685017a6f9d8794ad5e5b6f08e
 SHA512:
-  metadata.gz: 215b347f690e66ec1e6d763e588f4f0afeb0e6c7dd35f3d087a94906dd429613879299f99f953e9c4b7f9ac3e4a0fe9927ef1ab141fb4693617878ae8b846beb
-  data.tar.gz: 59d6acc3c8adb45d1e66aabd36b28171b570621dc7074aa8d391b66c038fc17a58230239e5ec1452e24c86d14ce7c698d7b65902dba9a36a118b0d5b8eb76209
+  metadata.gz: 7605bc8de9525538dc8cc5125145857530be95830abbd55ff25d8243a2431c7d943d718f6d08cea1742a472a2ab81db2e130be918dce45ef21a549efee2c0a90
+  data.tar.gz: f7160c208b717e869584cb20b499605510d4d288683afbe685a3c11a5ef9bbaf997b3ceaf7cb1378ced949b51fa7d089779840134ac54547edd85bf499d82b41

data/.gitignore

@@ -2,6 +2,7 @@
 .DS_Store
 
 ## TEXTMATE
+*.tm_project
 *.tmproj
 tmtags
 
@@ -41,3 +42,5 @@ public
 .rspec
 .rails-version
 .rbenv-version
+# for easy switching between master and 0-6-stable
+.localeapp

data/.travis.yml

@@ -1,8 +1,7 @@
 script: bundle exec rake test
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.2.0
+  - 2.2
 before_install:
   - gem update --system
   - gem --version
@@ -13,7 +12,5 @@ env:
   - RAILS=3.2.14
 matrix:
   exclude:
-    - rvm: 2.0.0
-      env: RAILS=3.0.20
-    - rvm: 2.2.0
+    - rvm: 2.2
       env: RAILS=3.0.20

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-## 0-6-stable (unreleased) - [compare](https://github.com/gregbell/active_admin/compare/v0.6.5...0-6-stable)
+## 0-6-stable (unreleased) - [compare](https://github.com/gregbell/active_admin/compare/v0.6.6...0-6-stable)
+
+## 0.6.6 - [compare](https://github.com/gregbell/active_admin/compare/v0.6.5...v0.6.6)
+
+* Backport of [#3779][] from [@aaronsakowski][] by [@timoschilling][]
+* Fix issue with model attribute matching metasearch method name [#3698][] by [@azach][]
+* Fix default delete prompt on Rails 3.0.x [#3765][] by [@craigmcnamara][]
 
 ## 0.6.5 - [compare](https://github.com/gregbell/active_admin/compare/v0.6.4...v0.6.5)
 
@@ -936,6 +942,9 @@ of the highlights. 250 commits. Enough said.
 [#2847]: https://github.com/activeadmin/activeadmin/issues/2847
 [#3489]: https://github.com/activeadmin/activeadmin/issues/3489
 [#3659]: https://github.com/activeadmin/activeadmin/issues/3659
+[#3698]: https://github.com/activeadmin/activeadmin/issues/3698
+[#3765]: https://github.com/activeadmin/activeadmin/issues/3765
+[#3779]: https://github.com/activeadmin/activeadmin/issues/3779
 [@Bishop]: https://github.com/Bishop
 [@BoboFraggins]: https://github.com/BoboFraggins
 [@DMajrekar]: https://github.com/DMajrekar
@@ -945,15 +954,18 @@ of the highlights. 250 commits. Enough said.
 [@TBAA]: https://github.com/TBAA
 [@TiagoCardoso1983]: https://github.com/TiagoCardoso1983
 [@ZequeZ]: https://github.com/ZequeZ
+[@aaronsakowski]: https://github.com/aaronsakowski
 [@adrienkohlbecker]: https://github.com/adrienkohlbecker
 [@ai]: https://github.com/ai
 [@amiel]: https://github.com/amiel
+[@azach]: https://github.com/azach
 [@ball-hayden]: https://github.com/ball-hayden
 [@bobbytables]: https://github.com/bobbytables
 [@caifara]: https://github.com/caifara
 [@cknoxrun]: https://github.com/cknoxrun
 [@comboy]: https://github.com/comboy
 [@coreyward]: https://github.com/coreyward
+[@craigmcnamara]: https://github.com/craigmcnamara
 [@dapi]: https://github.com/dapi
 [@dbussin]: https://github.com/dbussin
 [@developer88]: https://github.com/developer88

data/app/assets/javascripts/active_admin/components/jquery.aa.checkbox-toggler.js.coffee

@@ -1,7 +1,7 @@
 window.ActiveAdmin.CheckboxToggler = class ActiveAdmin.CheckboxToggler
   constructor: (@options, @container)->
     defaults = {}
-    @options = $.extend {}, defaults, options
+    @options = $.extend {}, defaults, @options
     @_init()
     @_bind()
 

data/app/assets/javascripts/active_admin/components/jquery.aa.dropdown-menu.js.coffee

@@ -10,7 +10,7 @@ window.ActiveAdmin.DropdownMenu = class ActiveAdmin.DropdownMenu
       onClickActionItemCallback: null
     }
 
-    @options = $.extend({}, defaults, options)
+    @options = $.extend({}, defaults, @options)
 
     @$menuButton = @$element.find(".dropdown_menu_button")
     @$menuList = @$element.find(".dropdown_menu_list_wrapper")

data/lib/active_admin/inputs/filter_string_input.rb

@@ -9,7 +9,7 @@ module ActiveAdmin
       # If the filter method includes a search condition, build a normal string search field.
       # Else, build a search field with a companion dropdown to choose a search condition from.
       def to_html
-        if @object.respond_to? method
+        if @object.methods.exclude?(method) && @object.respond_to?(method)
           input_wrapping do
             label_html <<
             builder.text_field(method, input_html_options)

data/lib/active_admin/resource/action_items.rb

@@ -70,7 +70,7 @@ module ActiveAdmin
           if controller.action_methods.include?("destroy") && authorized?(ActiveAdmin::Auth::DESTROY, resource)
             link_to(I18n.t('active_admin.delete_model', :model => active_admin_config.resource_label),
               resource_path(resource),
-              :method => :delete, :data => {:confirm => I18n.t('active_admin.delete_confirmation')})
+              :method => :delete, 'data-confirm' => I18n.t('active_admin.delete_confirmation'))
           end
         end
       end

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '0.6.5'
+  VERSION = '0.6.6'
 end

data/lib/active_admin/views/index_as_table.rb

@@ -194,7 +194,7 @@ module ActiveAdmin
               links << link_to(I18n.t('active_admin.edit'), edit_resource_path(resource), :class => "member_link edit_link")
             end
             if controller.action_methods.include?('destroy') && authorized?(ActiveAdmin::Auth::DESTROY, resource)
-              links << link_to(I18n.t('active_admin.delete'), resource_path(resource), :method => :delete, :data => {:confirm => I18n.t('active_admin.delete_confirmation')}, :class => "member_link delete_link")
+              links << link_to(I18n.t('active_admin.delete'), resource_path(resource), :method => :delete, 'data-confirm' => I18n.t('active_admin.delete_confirmation'), :class => "member_link delete_link")
             end
             links
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Greg Bell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre