Merge pull request #2383 from fmh/patch-1

Fix removal buttons within filtringselect parents
railsadminteam · Aug 21, 2015 · 11c9cdd · 11c9cdd
2 parents 67a782e + c5d615c
commit 11c9cdd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/assets/javascripts/rails_admin/ra.widgets.coffee b/app/assets/javascripts/rails_admin/ra.widgets.coffee
@@ -63,7 +63,7 @@ $(document).on 'rails_admin.dom_ready', (e, content) ->
     content.find('[data-filteringmultiselect]').each ->
       $(this).filteringMultiselect $(this).data('options')
       if $(this).parents("#modal").length # hide link if we already are inside a dialog (endless issues on nested dialogs with JS)
-        $(this).parents('.control-group').find('.btn').remove()
+        $(this).siblings('.btn').remove()
       else
         $(this).parents('.control-group').first().remoteForm()
 
@@ -72,7 +72,7 @@ $(document).on 'rails_admin.dom_ready', (e, content) ->
     content.find('[data-filteringselect]').each ->
       $(this).filteringSelect $(this).data('options')
       if $(this).parents("#modal").length # hide link if we already are inside a dialog (endless issues on nested dialogs with JS)
-        $(this).parents('.control-group').find('.btn').remove()
+        $(this).siblings('.btn').remove()
       else
         $(this).parents('.control-group').first().remoteForm()