Merge pull request railsadminteam#1646 from signpost/master

These templates explode with older versions of rails where .in? doesn't accept more than one argument
elado · May 18, 2013 · 074a985 · 074a985
2 parents 59adb72 + d7deefc
commit 074a985
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/views/rails_admin/main/_dashboard_history.html.haml b/app/views/rails_admin/main/_dashboard_history.html.haml
@@ -17,4 +17,4 @@
             %td= label
         - else
           %td= "#{t.table} ##{t.item}"
-        %td= t.message.in?('delete', 'new') ? t("admin.actions.#{t.message}.done").capitalize : t.message
+        %td= t.message.in?(['delete', 'new']) ? t("admin.actions.#{t.message}.done").capitalize : t.message
diff --git a/app/views/rails_admin/main/history.html.haml b/app/views/rails_admin/main/history.html.haml
@@ -41,7 +41,7 @@
               %td= label
           - else
             %td= "#{@abstract_model.config.label} ##{object.item}"
-        %td= object.message.in?('delete', 'new') ? t("admin.actions.#{object.message}.done").capitalize : object.message
+        %td= object.message.in?(['delete', 'new']) ? t("admin.actions.#{object.message}.done").capitalize : object.message
 
 - unless params[:all] || !@history.respond_to?(:current_page)
   = paginate(@history, :theme => 'twitter-bootstrap', :remote => true)