rails_admin 0.6.1 → 0.6.2

data/app/views/rails_admin/main/_form_field.html.haml

@@ -1 +1 @@
-= form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({ :value => field.form_value, :checked => field.form_value.in?([true, '1'])})
+= form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({ value: field.form_value, checked: field.form_value.in?([true, '1'])})

data/app/views/rails_admin/main/_form_file_upload.html.haml

@@ -1,13 +1,13 @@
 - file = form.object.send(field.method_name).presence
 
-.toggle{:style => ('display:none;' if file && field.delete_method && form.object.send(field.delete_method) == '1')}
+.toggle{style: ('display:none;' if file && field.delete_method && form.object.send(field.delete_method) == '1')}
   - if value = field.pretty_value
     = value
-  = form.file_field(field.name, field.html_attributes.reverse_merge({ :data => { :fileupload => true }}))
+  = form.file_field(field.name, field.html_attributes.reverse_merge({ data: { fileupload: true }}))
 - if field.optional? && field.errors.blank? && file && field.delete_method
-  %a.btn.btn-info{:href => '#', :'data-toggle' => 'button', :onclick => "$(this).siblings('[type=checkbox]').click(); $(this).siblings('.toggle').toggle('slow'); jQuery(this).toggleClass('btn-danger btn-info'); return false"}
+  %a.btn.btn-info{href: '#', :'data-toggle' => 'button', onclick: "$(this).siblings('[type=checkbox]').click(); $(this).siblings('.toggle').toggle('slow'); jQuery(this).toggleClass('btn-danger btn-info'); return false"}
     %i.icon-white.icon-trash
     = I18n.t('admin.actions.delete.menu').capitalize + " #{field.label.downcase}"
-  = form.check_box(field.delete_method, :style => 'display:none;' )
+  = form.check_box(field.delete_method, style: 'display:none;' )
 - if field.cache_method
   = form.hidden_field(field.cache_method)

data/app/views/rails_admin/main/_form_filtering_multiselect.html.haml

@@ -22,26 +22,26 @@
   end
 
   js_data = {
-    :xhr => xhr,
-    :'edit-url' => (authorized?(:edit, config.abstract_model) ? edit_path(:model_name => config.abstract_model.to_param, :id => '__ID__') : ''),
-    :remote_source => index_path(config.abstract_model, :source_object_id => form.object.id, :source_abstract_model => source_abstract_model.to_param, :associated_collection => field.name, :current_action => current_action, :compact => true),
-    :sortable => !!field.orderable,
-    :cacheAll => !!field.associated_collection_cache_all,
-    :regional => {
-      :chooseAll => t("admin.misc.chose_all"),
-      :chosen    => t("admin.misc.chosen", :name => config.label_plural),
-      :clearAll  => t("admin.misc.clear_all"),
-      :search    => t("admin.misc.search"),
-      :up        => t("admin.misc.up"),
-      :down      => t("admin.misc.down")
+    xhr: xhr,
+    :'edit-url' => (authorized?(:edit, config.abstract_model) ? edit_path(model_name: config.abstract_model.to_param, id: '__ID__') : ''),
+    remote_source: index_path(config.abstract_model, source_object_id: form.object.id, source_abstract_model: source_abstract_model.to_param, associated_collection: field.name, current_action: current_action, compact: true),
+    sortable: !!field.orderable,
+    cacheAll: !!field.associated_collection_cache_all,
+    regional: {
+      chooseAll: t("admin.misc.chose_all"),
+      chosen: t("admin.misc.chosen", name: config.label_plural),
+      clearAll: t("admin.misc.clear_all"),
+      search: t("admin.misc.search"),
+      up: t("admin.misc.up"),
+      down: t("admin.misc.down")
     }
   }
 
-%input{:name => form.dom_name(field), :type => "hidden", :value => ""}
+%input{name: form.dom_name(field), type: "hidden", value: ""}
 
 - selected_ids = (hdv = field.form_default_value).nil? ? selected_ids : hdv
-= form.select field.method_name, collection, { :selected => selected_ids, :object => form.object }, field.html_attributes.reverse_merge({:data => { :filteringmultiselect => true, :options => js_data.to_json }, :multiple => true})
+= form.select field.method_name, collection, { selected: selected_ids, object: form.object }, field.html_attributes.reverse_merge({data: { filteringmultiselect: true, options: js_data.to_json }, multiple: true})
 - if authorized?(:new, config.abstract_model) && field.inline_add
-  - path_hash = { :model_name => config.abstract_model.to_param, :modal => true }
-  - path_hash.merge!({ :associations => { field.inverse_of => (form.object.persisted? ? form.object.id : 'new') } }) if field.inverse_of
-  = link_to "<i class=\"icon-plus icon-white\"></i> ".html_safe + wording_for(:link, :new, config.abstract_model), '#', :data => { :link => new_path(path_hash) }, :class => "create btn btn-info", :style => 'margin-left:10px'
+  - path_hash = { model_name: config.abstract_model.to_param, modal: true }
+  - path_hash.merge!({ associations: { field.inverse_of => (form.object.persisted? ? form.object.id : 'new') } }) if field.inverse_of
+  = link_to "<i class=\"icon-plus icon-white\"></i> ".html_safe + wording_for(:link, :new, config.abstract_model), '#', data: { link: new_path(path_hash) }, class: "create btn btn-info", style: 'margin-left:10px'

data/app/views/rails_admin/main/_form_filtering_select.html.haml

@@ -14,24 +14,24 @@
 
   current_action = params[:action].in?(['create', 'new']) ? 'create' : 'update'
 
-  edit_url = authorized?(:edit, config.abstract_model) ? edit_path(:model_name => config.abstract_model.to_param, :modal => true, :id => '__ID__') : ''
+  edit_url = authorized?(:edit, config.abstract_model) ? edit_path(model_name: config.abstract_model.to_param, modal: true, id: '__ID__') : ''
 
   xhr = !field.associated_collection_cache_all
 
   collection = xhr ? [[selected_name, selected_id]] : controller.list_entries(config, :index, field.associated_collection_scope, false).map { |o| [o.send(field.associated_object_label_method), o.send(field.associated_primary_key)] }
 
   js_data = {
-    :xhr => xhr,
-    :remote_source => index_path(config.abstract_model.to_param, :source_object_id => form.object.id, :source_abstract_model => source_abstract_model.to_param, :associated_collection => field.name, :current_action => current_action, :compact => true)
+    xhr: xhr,
+    remote_source: index_path(config.abstract_model.to_param, source_object_id: form.object.id, source_abstract_model: source_abstract_model.to_param, associated_collection: field.name, current_action: current_action, compact: true)
   }
 
 - selected_id = (hdv = field.form_default_value).nil? ? selected_id : hdv
-= form.select field.method_name, collection, { :selected => selected_id, :include_blank => true }, field.html_attributes.reverse_merge({ :data => { :filteringselect => true, :options => js_data.to_json }, :placeholder => t('admin.misc.search') })
+= form.select field.method_name, collection, { selected: selected_id, include_blank: true }, field.html_attributes.reverse_merge({ data: { filteringselect: true, options: js_data.to_json }, placeholder: t('admin.misc.search') })
 
 - if authorized?(:new, config.abstract_model) && field.inline_add
-  - path_hash = { :model_name => config.abstract_model.to_param, :modal => true }
-  - path_hash.merge!({ :associations => { field.inverse_of => (form.object.persisted? ? form.object.id : 'new') } }) if field.inverse_of
-  = link_to "<i class=\"icon-plus icon-white\"></i> ".html_safe + wording_for(:link, :new, config.abstract_model), '#', :data => { :link => new_path(path_hash) }, :class => "btn btn-info create", :style => 'margin-left:10px'
+  - path_hash = { model_name: config.abstract_model.to_param, modal: true }
+  - path_hash.merge!({ associations: { field.inverse_of => (form.object.persisted? ? form.object.id : 'new') } }) if field.inverse_of
+  = link_to "<i class=\"icon-plus icon-white\"></i> ".html_safe + wording_for(:link, :new, config.abstract_model), '#', data: { link: new_path(path_hash) }, class: "btn btn-info create", style: 'margin-left:10px'
 
 - if edit_url.present? && field.inline_edit
-  = link_to "<i class=\"icon-pencil icon-white\"></i> ".html_safe + wording_for(:link, :edit, config.abstract_model), '#', :data => { :link => edit_url }, :class => "btn btn-info update #{field.value.nil? && 'disabled'}", :style => 'margin-left:10px'
+  = link_to "<i class=\"icon-pencil icon-white\"></i> ".html_safe + wording_for(:link, :edit, config.abstract_model), '#', data: { link: edit_url }, class: "btn btn-info update #{field.value.nil? && 'disabled'}", style: 'margin-left:10px'

data/app/views/rails_admin/main/_form_nested_many.html.haml

@@ -1,14 +1,14 @@
-.controls{:data => { :nestedmany => true }}
+.controls{data: { nestedmany: true }}
   .btn-group
-    %a.btn.btn-info.toggler{:'data-toggle' => "button", :'data-target' => "#{form.jquery_namespace(field)} > .tab-content, #{form.jquery_namespace(field)} > .controls > .nav", :class => (field.active? ? 'active' : '')}
+    %a.btn.btn-info.toggler{:'data-toggle' => "button", :'data-target' => "#{form.jquery_namespace(field)} > .tab-content, #{form.jquery_namespace(field)} > .controls > .nav", class: (field.active? ? 'active' : '')}
       %i.icon-white
     - unless field.nested_form[:update_only] || !field.inline_add
-      = form.link_to_add "<i class=\"icon-plus icon-white\"></i> #{wording_for(:link, :new, field.associated_model_config.abstract_model)}".html_safe, field.name, { :class => 'btn btn-info' }
+      = form.link_to_add "<i class=\"icon-plus icon-white\"></i> #{wording_for(:link, :new, field.associated_model_config.abstract_model)}".html_safe, field.name, { class: 'btn btn-info' }
   = form.errors_for(field)
   = form.help_for(field)
-  %ul.nav.nav-tabs{ :style => 'margin-top:5px' }
+  %ul.nav.nav-tabs{ style: 'margin-top:5px' }
 .tab-content
   = form.fields_for field.name do |nested_form|
     - if field.nested_form[:allow_destroy] || nested_form.options[:child_index] == "new_#{field.name}"
       = nested_form.link_to_remove '<span class="btn btn-small btn-danger"><i class="icon-trash icon-white"></i></span>'.html_safe
-    = nested_form.generate({:action => :nested, :model_config => field.associated_model_config, :nested_in => field.name })
+    = nested_form.generate({action: :nested, model_config: field.associated_model_config, nested_in: field.name })

data/app/views/rails_admin/main/_form_nested_one.html.haml

@@ -1,12 +1,12 @@
-.controls{:data => { :nestedone => true }}
-  %ul.nav{:style => 'margin-bottom:0px; display:none'}
+.controls{data: { nestedone: true }}
+  %ul.nav{style: 'margin-bottom:0px; display:none'}
   .btn-group
-    %a.btn.btn-info.toggler{:'data-toggle' => "button", :'data-target' => "#{form.jquery_namespace(field)} > .tab-content", :class => (field.active? ? 'active' : '') }
+    %a.btn.btn-info.toggler{:'data-toggle' => "button", :'data-target' => "#{form.jquery_namespace(field)} > .tab-content", class: (field.active? ? 'active' : '') }
       %i.icon-white
     - unless field.nested_form[:update_only] || !field.inline_add
       = form.link_to_add "<i class=\"icon-plus icon-white\"></i> #{wording_for(:link, :new, field.associated_model_config.abstract_model)}".html_safe,
         field.name,
-        { :class => 'btn btn-info', :'data-add-label' => "<i class=\"icon-plus icon-white\"></i> #{wording_for(:link, :new, field.associated_model_config.abstract_model)}".gsub("\n", "") }
+        { class: 'btn btn-info', :'data-add-label' => "<i class=\"icon-plus icon-white\"></i> #{wording_for(:link, :new, field.associated_model_config.abstract_model)}".gsub("\n", "") }
   = form.errors_for(field)
   = form.help_for(field)
 
@@ -14,4 +14,4 @@
   = form.fields_for field.name do |nested_form|
     - if field.nested_form[:allow_destroy]
       = nested_form.link_to_remove '<span class="btn btn-small btn-danger"><i class="icon-trash icon-white"></i></span>'.html_safe
-    = nested_form.generate({:action => :nested, :model_config => field.associated_model_config, :nested_in => field.name })
+    = nested_form.generate({action: :nested, model_config: field.associated_model_config, nested_in: field.name })

data/app/views/rails_admin/main/_form_polymorphic_association.html.haml

@@ -1,10 +1,10 @@
 :ruby
   type_collection = field.polymorphic_type_collection
-  type_column = field.association[:foreign_type].to_s
+  type_column = field.association.foreign_type.to_s
   selected_type = field.bindings[:object].send(type_column)
   collection = field.associated_collection(selected_type)
-  selected = field.bindings[:object].send(field.association[:name])
+  selected = field.bindings[:object].send(field.association.name)
   column_type_dom_id = form.dom_id(field).sub(field.method_name.to_s, type_column)
 
-= form.select type_column, type_collection, {:include_blank => true, :selected => selected_type}, :id => column_type_dom_id, :data => { :polymorphic => true, :urls => field.polymorphic_type_urls.to_json }
-= form.select field.method_name, collection, {:include_blank => true, :selected => selected.try(:id)}, :style => "margin-left:10px;"
+= form.select type_column, type_collection, {include_blank: true, selected: selected_type}, id: column_type_dom_id, data: { polymorphic: true, urls: field.polymorphic_type_urls.to_json }
+= form.select field.method_name, collection, {include_blank: true, selected: selected.try(:id)}, style: "margin-left:10px;"

data/app/views/rails_admin/main/_form_text.html.haml

@@ -1 +1 @@
-= form.text_area field.method_name, field.html_attributes.reverse_merge(:data => { :richtext => false, :options => {}.to_json }).reverse_merge({ :value => field.form_value })
+= form.text_area field.method_name, field.html_attributes.reverse_merge(data: { richtext: false, options: {}.to_json }).reverse_merge({ value: field.form_value })

data/app/views/rails_admin/main/_form_wysihtml5.html.haml

@@ -1,8 +1,8 @@
 :ruby
   js_data = {
-    :csspath => field.css_location,
-    :jspath => field.js_location,
-    :config_options => field.config_options.to_json
+    csspath: field.css_location,
+    jspath: field.js_location,
+    config_options: field.config_options.to_json
   }
 
-= form.text_area field.method_name, field.html_attributes.reverse_merge(:data => { :richtext => 'bootstrap-wysihtml5', :options => js_data.to_json }).reverse_merge({ :value => field.form_value })
+= form.text_area field.method_name, field.html_attributes.reverse_merge(data: { richtext: 'bootstrap-wysihtml5', options: js_data.to_json }).reverse_merge({ value: field.form_value })

data/app/views/rails_admin/main/_submit_buttons.html.haml

@@ -1,15 +1,15 @@
-%input{:type => :hidden, :name => 'return_to', :value => (params[:return_to].presence || request.referer)}
+%input{type: :hidden, name: 'return_to', value: (params[:return_to].presence || request.referer)}
 .form-actions
-  %button.btn.btn-primary{:type => "submit", :name => "_save", :'data-disable-with' => t("admin.form.save")}
+  %button.btn.btn-primary{type: "submit", name: "_save", :'data-disable-with' => t("admin.form.save")}
     %i.icon-white.icon-ok
     = t("admin.form.save")
   %span.extra_buttons
     - if authorized? :new, @abstract_model
-      %button.btn.btn-info{:type => "submit", :name => "_add_another", :'data-disable-with' => t("admin.form.save_and_add_another")}
+      %button.btn.btn-info{type: "submit", name: "_add_another", :'data-disable-with' => t("admin.form.save_and_add_another")}
         = t("admin.form.save_and_add_another")
     - if authorized? :edit, @abstract_model
-      %button.btn.btn-info{:type => "submit", :name => "_add_edit", :'data-disable-with' => t("admin.form.save_and_edit")}
+      %button.btn.btn-info{type: "submit", name: "_add_edit", :'data-disable-with' => t("admin.form.save_and_edit")}
         = t("admin.form.save_and_edit")
-    %button.btn{:type => "submit", :name => "_continue", :'data-disable-with' => t("admin.form.cancel")}
+    %button.btn{type: "submit", name: "_continue", :'data-disable-with' => t("admin.form.cancel")}
       %i.icon-remove
       = t("admin.form.cancel")

data/app/views/rails_admin/main/bulk_delete.html.haml

@@ -1,11 +1,11 @@
 %h4= I18n.t('admin.form.bulk_delete')
-%ul= render :partial => "delete_notice", :collection => @objects
-= form_tag bulk_delete_path(:model_name => @abstract_model.to_param, :bulk_ids => @objects.map(&:id)), :method => :delete do
+%ul= render partial: "delete_notice", collection: @objects
+= form_tag bulk_delete_path(model_name: @abstract_model.to_param, bulk_ids: @objects.map(&:id)), method: :delete do
   .form-actions
-    %input{:type => :hidden, :name => 'return_to', :value => (params[:return_to].presence || request.referer)}
-    %button.btn.btn-danger{:type => "submit", :'data-disable-with' => t("admin.form.confirmation")}
+    %input{type: :hidden, name: 'return_to', value: (params[:return_to].presence || request.referer)}
+    %button.btn.btn-danger{type: "submit", :'data-disable-with' => t("admin.form.confirmation")}
       %i.icon-white.icon-ok
       = t("admin.form.confirmation")
-    %button.btn{:type => "submit", :name => "_continue", :'data-disable-with' => t("admin.form.cancel")}
+    %button.btn{type: "submit", name: "_continue", :'data-disable-with' => t("admin.form.cancel")}
       %i.icon-remove
       = t("admin.form.cancel")

data/app/views/rails_admin/main/dashboard.html.haml

@@ -9,22 +9,22 @@
     %tbody
       - @abstract_models.each do |abstract_model|
         - if authorized? :index, abstract_model
-          - index_path = index_path(:model_name => abstract_model.to_param)
+          - index_path = index_path(model_name: abstract_model.to_param)
           - row_class = "#{cycle("odd", "even")}#{" link" if index_path} #{abstract_model.param_key}_links"
-          %tr{:class => row_class, :"data-link" => index_path}
+          %tr{class: row_class, :"data-link" => index_path}
             - last_used = @most_recent_changes[abstract_model.pretty_name]
             - active = last_used.try(:today?)
             %td
-              %span.show= link_to abstract_model.config.label_plural, index_path, :class => 'pjax'
+              %span.show= link_to abstract_model.config.label_plural, index_path, class: 'pjax'
             %td
               - if last_used
                 = time_ago_in_words last_used
                 = t "admin.misc.ago"
             %td
               - count = @count[abstract_model.pretty_name]
-              - percent = count > 0 ? (@max <= 1 ? count : ((Math.log(count) * 100.0) / Math.log(@max)).to_i + 1) : -1
-              .progress{:style => "margin-bottom:0px", :class => "progress-#{get_indicator(percent)} #{active && 'active progress-striped'}"  }
-                .bar.animate-width-to{:'data-animate-length' => ([1.0, percent].max.to_i * 20), :'data-animate-width-to' => "#{[2.0, percent].max.to_i}%", :style => "width:2%"}
+              - percent = count > 0 ? (@max <= 1 ? count : ((Math.log(count+1) * 100.0) / Math.log(@max+1)).to_i) : -1
+              .progress{style: "margin-bottom:0px", class: "progress-#{get_indicator(percent)} #{active && 'active progress-striped'}"  }
+                .bar.animate-width-to{:'data-animate-length' => ([1.0, percent].max.to_i * 20), :'data-animate-width-to' => "#{[2.0, percent].max.to_i}%", style: "width:2%"}
                   = @count[abstract_model.pretty_name]
             %td.links
               %ul.inline= menu_for :collection, abstract_model, nil, true
@@ -32,4 +32,4 @@
   #block-tables.block
     .content
       %h2= t("admin.actions.history_index.menu")
-      = render :partial => 'rails_admin/main/dashboard_history'
+      = render partial: 'rails_admin/main/dashboard_history'

data/app/views/rails_admin/main/delete.html.haml

@@ -1,18 +1,18 @@
 %h4
-  = t("admin.form.are_you_sure_you_want_to_delete_the_object", :model_name => @abstract_model.pretty_name.downcase)
+  = t("admin.form.are_you_sure_you_want_to_delete_the_object", model_name: @abstract_model.pretty_name.downcase)
   “
-  %strong>= @model_config.with(:object => @object).object_label
+  %strong>= @model_config.with(object: @object).object_label
   \”
   %span>
   = t("admin.form.all_of_the_following_related_items_will_be_deleted")
 
-%ul= render :partial => "delete_notice", :object => @object
-= form_for(@object, :url => delete_path(:model_name => @abstract_model.to_param, :id => @object.id), :html => {:method => "delete"}) do
-  %input{:type => :hidden, :name => 'return_to', :value => (params[:return_to].presence || request.referer)}
+%ul= render partial: "delete_notice", object: @object
+= form_for(@object, url: delete_path(model_name: @abstract_model.to_param, id: @object.id), html: {method: "delete"}) do
+  %input{type: :hidden, name: 'return_to', value: (params[:return_to].presence || request.referer)}
   .form-actions
-    %button.btn.btn-danger{:type => "submit", :'data-disable-with' => t("admin.form.confirmation")}
+    %button.btn.btn-danger{type: "submit", :'data-disable-with' => t("admin.form.confirmation")}
       %i.icon-white.icon-ok
       = t("admin.form.confirmation")
-    %button.btn{:type => "submit", :name => "_continue", :'data-disable-with' => t("admin.form.cancel")}
+    %button.btn{type: "submit", name: "_continue", :'data-disable-with' => t("admin.form.cancel")}
       %i.icon-remove
       = t("admin.form.cancel")

data/app/views/rails_admin/main/edit.html.haml

@@ -1,2 +1,2 @@
-= rails_admin_form_for @object, :url => edit_path(@abstract_model, @object.id), :as => @abstract_model.param_key, :html => { :method => "put", :multipart => true, :class => "form-horizontal denser", :data => { :title => @page_name } } do |form|
-  = form.generate :action => :update
+= rails_admin_form_for @object, url: edit_path(@abstract_model, @object.id), as: @abstract_model.param_key, html: { method: "put", multipart: true, class: "form-horizontal denser", data: { title: @page_name } } do |form|
+  = form.generate action: :update

data/app/views/rails_admin/main/export.html.haml

@@ -1,80 +1,80 @@
 - params = request.params.except(:action, :controller, :utf8, :page, :per_page, :format, :authenticity_token)
-- visible_fields = @model_config.export.with(:view => self, :object => @abstract_model.model.new, :controller => self.controller).visible_fields
+- visible_fields = @model_config.export.with(view: self, object: @abstract_model.model.new, controller: self.controller).visible_fields
 
-= form_tag export_path(params.merge(:all => true)), :method => 'post', :class => 'form-horizontal denser' do
+= form_tag export_path(params.merge(all: true)), method: 'post', class: 'form-horizontal denser' do
 
-  %input{:name => "send_data", :type => "hidden", :value => "true"}/
-  %fieldset{:id => 'fields_to_export'}
+  %input{name: "send_data", type: "hidden", value: "true"}/
+  %fieldset{id: 'fields_to_export'}
     %div.control-group
       %div.controls
-        %label.checkbox{:for => 'check_all'}
+        %label.checkbox{for: 'check_all'}
           = t('admin.export.select_all_fields')
-          = check_box_tag 'all', 'all', true, { :id => 'check_all' }
+          = check_box_tag 'all', 'all', true, { id: 'check_all' }
     %legend
       %i.icon-chevron-down
       = t('admin.export.select')
     .control-group
-      %label.control-label{:rel => 'tooltip', :'data-original-title' => t('admin.export.click_to_reverse_selection'), :onclick => 'jQuery(this).siblings(".controls").find("input").click()'}= t('admin.export.fields_from', :name => @model_config.label_plural.downcase)
+      %label.control-label{rel: 'tooltip', :'data-original-title' => t('admin.export.click_to_reverse_selection'), onclick: 'jQuery(this).siblings(".controls").find("input").click()'}= t('admin.export.fields_from', name: @model_config.label_plural.downcase)
       .controls
-        - visible_fields.select{ |f| !f.association? || f.association[:polymorphic] }.each do |field|
+        - visible_fields.select{ |f| !f.association? || f.association.polymorphic? }.each do |field|
           - list = field.virtual? ? 'methods' : 'only'
-          - if field.association? && field.association[:polymorphic]
-            %label.checkbox{:for => "schema_#{list}_#{field.method_name}"}
-              = check_box_tag "schema[#{list}][]", field.method_name, true, { :id => "schema_#{list}_#{field.method_name}" }
+          - if field.association? && field.association.polymorphic?
+            %label.checkbox{for: "schema_#{list}_#{field.method_name}"}
+              = check_box_tag "schema[#{list}][]", field.method_name, true, { id: "schema_#{list}_#{field.method_name}" }
               = field.label + " [id]"
-            - polymorphic_type_column_name = @abstract_model.properties.find {|p| field.association[:foreign_type] == p[:name] }[:name]
-            %label.checkbox{:for => "schema_#{list}_#{polymorphic_type_column_name}"}
-              = check_box_tag "schema[#{list}][]", polymorphic_type_column_name, true, { :id => "schema_#{list}_#{polymorphic_type_column_name}" }
+            - polymorphic_type_column_name = @abstract_model.properties.find {|p| field.association.foreign_type == p.name }.name
+            %label.checkbox{for: "schema_#{list}_#{polymorphic_type_column_name}"}
+              = check_box_tag "schema[#{list}][]", polymorphic_type_column_name, true, { id: "schema_#{list}_#{polymorphic_type_column_name}" }
               = field.label + " [type]"
           - else
-            %label.checkbox{:for => "schema_#{list}_#{field.name}"}
-              = check_box_tag "schema[#{list}][]", field.name, true, { :id => "schema_#{list}_#{field.name}" }
+            %label.checkbox{for: "schema_#{list}_#{field.name}"}
+              = check_box_tag "schema[#{list}][]", field.name, true, { id: "schema_#{list}_#{field.name}" }
               = field.label
 
-    - visible_fields.select{ |f| f.association? && !f.association[:polymorphic] }.each do |field|
-      - fields = field.associated_model_config.export.with(:controller => self.controller, :view => self, :object => (associated_model = field.associated_model_config.abstract_model.model).new).visible_fields.select{ |f| !f.association? }
+    - visible_fields.select{ |f| f.association? && !f.association.polymorphic? }.each do |field|
+      - fields = field.associated_model_config.export.with(controller: self.controller, view: self, object: (associated_model = field.associated_model_config.abstract_model.model).new).visible_fields.select{ |f| !f.association? }
       .control-group
-        %label.control-label{:rel => 'tooltip', :'data-original-title' => t('admin.export.click_to_reverse_selection'), :onclick => 'jQuery(this).siblings(".controls").find("input").click()'}= t('admin.export.fields_from_associated', :name => field.label.downcase)
+        %label.control-label{rel: 'tooltip', :'data-original-title' => t('admin.export.click_to_reverse_selection'), onclick: 'jQuery(this).siblings(".controls").find("input").click()'}= t('admin.export.fields_from_associated', name: field.label.downcase)
         .controls
           - fields.each do |associated_model_field|
             - list = associated_model_field.virtual? ? 'methods' : 'only'
-            %label.checkbox{:for => "schema_include_#{field.name}_#{list}_#{associated_model_field.name}"}
-              = check_box_tag "schema[include][#{field.name}][#{list}][]", associated_model_field.name, true, { :id => "schema_include_#{field.name}_#{list}_#{associated_model_field.name}" }
+            %label.checkbox{for: "schema_include_#{field.name}_#{list}_#{associated_model_field.name}"}
+              = check_box_tag "schema[include][#{field.name}][#{list}][]", associated_model_field.name, true, { id: "schema_include_#{field.name}_#{list}_#{associated_model_field.name}" }
               = associated_model_field.label
 
   %fieldset
     %legend
       %i.icon-chevron-down
-      = t('admin.export.options_for', :name => 'csv')
+      = t('admin.export.options_for', name: 'csv')
     .control-group
-      - guessed_encoding = (Rails.configuration.database_configuration[Rails.env]['encoding'].presence rescue 'UTF-8') || 'UTF-8'
-      %label.control-label{:for => "csv_options_encoding_to"}= t('admin.export.csv.encoding_to')
+      - guessed_encoding = @abstract_model.encoding
+      %label.control-label{for: "csv_options_encoding_to"}= t('admin.export.csv.encoding_to')
       .controls
         -# from http://books.google.com/support/partner/bin/answer.py?answer=30990 :
         = select_tag 'csv_options[encoding_to]', options_for_select(["", "UTF-8", "UTF-16LE", "UTF-16BE", "UTF-32LE", "UTF-32BE", "UTF-7", "ISO-8859-1", "ISO-8859-15", "IBM-850", "MacRoman", "Windows-1252", "ISO-8859-3", "IBM-852", "ISO-8859-2", "MacCE", "Windows-1250", "IBM-855", "ISO-8859-5", "ISO-IR-111", "KOI8-R", "MacCyrillic", "Windows-1251", "CP-866", "KOI-U", "MacUkranian", "GB2312", "GBK", "GB18030", "HZ", "ISO-2022-CN", "Big5", "Big5-HKSCS", "EUC-TW", "EUC-JP", "ISO-2022-JP", "Shift_JIS", "EUC-KR", "UHC", "JOHAB", "ISO-2022-KR"])
-        %p.help-block= t('admin.export.csv.encoding_to_help', :name => guessed_encoding)
+        %p.help-block= t('admin.export.csv.encoding_to_help', name: guessed_encoding)
 
     .control-group
-      %label.control-label{:for => "csv_options_skip_header"}= t('admin.export.csv.skip_header')
+      %label.control-label{for: "csv_options_skip_header"}= t('admin.export.csv.skip_header')
       .controls
         = check_box_tag 'csv_options[skip_header]', 'true'
         %p.help-block= t('admin.export.csv.skip_header_help')
 
     .control-group
-      %label.control-label{:for => "csv_options_generator_col_sep"}= t('admin.export.csv.col_sep')
+      %label.control-label{for: "csv_options_generator_col_sep"}= t('admin.export.csv.col_sep')
       .controls
         = select_tag 'csv_options[generator][col_sep]', options_for_select({ '' => t('admin.export.csv.default_col_sep'), "<comma> ','" => ',', "<semicolon> ';'" => ';', '<tabs>' => "'\t'" })
-        %p.help-block= t('admin.export.csv.col_sep_help', :value => t('admin.export.csv.default_col_sep'))
+        %p.help-block= t('admin.export.csv.col_sep_help', value: t('admin.export.csv.default_col_sep'))
 
   .form-actions
-    %input{:type => :hidden, :name => 'return_to', :value => (params[:return_to].presence || request.referer)}
-    %button.btn.btn-primary{:type => "submit", :name => 'csv'}
+    %input{type: :hidden, name: 'return_to', value: (params[:return_to].presence || request.referer)}
+    %button.btn.btn-primary{type: "submit", name: 'csv'}
       %i.icon-white.icon-ok
-      = t("admin.export.confirmation", :name => 'csv')
-    %button.btn.btn-info{:type => "submit", :name => 'json'}
-      = t("admin.export.confirmation", :name => 'json')
-    %button.btn.btn-info{:type => "submit", :name => 'xml'}
-      = t("admin.export.confirmation", :name => 'xml')
-    %button.btn{:type => "submit", :name => "_continue"}
+      = t("admin.export.confirmation", name: 'csv')
+    %button.btn.btn-info{type: "submit", name: 'json'}
+      = t("admin.export.confirmation", name: 'json')
+    %button.btn.btn-info{type: "submit", name: 'xml'}
+      = t("admin.export.confirmation", name: 'xml')
+    %button.btn{type: "submit", name: "_continue"}
       %i.icon-remove
       = t("admin.form.cancel")

data/app/views/rails_admin/main/history.html.haml

@@ -5,38 +5,38 @@
 - sort_reverse = params[:sort_reverse]
 - path_method = params[:id] ? "history_show_path" : "history_index_path"
 
-= form_tag("", :method => "get", :class => "search pjax-form form-inline") do
+= form_tag("", method: "get", class: "search pjax-form form-inline") do
   .well
-    %input{:name => "query", :type => "search", :value => query, :placeholder => "#{t("admin.misc.filter")}", :class => 'input-small'}
-    %button.btn.btn-primary{:type => "submit", :'data-disable-with' => "<i class='icon-white icon-refresh'></i> ".html_safe + t("admin.misc.refresh")}
+    %input{name: "query", type: "search", value: query, placeholder: "#{t("admin.misc.filter")}", class: 'input-small'}
+    %button.btn.btn-primary{type: "submit", :'data-disable-with' => "<i class='icon-white icon-refresh'></i> ".html_safe + t("admin.misc.refresh")}
       %i.icon-white.icon-refresh
       = t("admin.misc.refresh")
 %table#history.table.table-striped.table-condensed
   %thead
     %tr
       - columns = []
-      - columns << { :property_name => "created_at", :css_class => "created_at",:link_text => t('admin.table_headers.created_at') }
-      - columns << { :property_name => "username",   :css_class => "username",  :link_text => t('admin.table_headers.username')   }
-      - columns << { :property_name => "item",       :css_class => "item",      :link_text => t('admin.table_headers.item')       } if @general
-      - columns << { :property_name => "message",    :css_class => "message",   :link_text => t('admin.table_headers.message')    }
+      - columns << { property_name: "created_at", css_class: "created_at",link_text: t('admin.table_headers.created_at') }
+      - columns << { property_name: "username",   css_class: "username",  link_text: t('admin.table_headers.username')   }
+      - columns << { property_name: "item",       css_class: "item",      link_text: t('admin.table_headers.item')       } if @general
+      - columns << { property_name: "message",    css_class: "message",   link_text: t('admin.table_headers.message')    }
 
       - columns.each do |column|
         - property_name = column[:property_name]
         - selected = (sort == property_name)
         - sort_direction = (sort_reverse ? "headerSortUp" : "headerSortDown" if selected)
-        - sort_location = send(path_method, params.except("sort_reverse").merge(:model_name => @abstract_model.to_param, :sort => property_name).merge(selected && sort_reverse != "true" ? {:sort_reverse => "true"} : {}))
-        %th{:class => "header pjax #{column[:css_class]} #{sort_direction if selected}", :'data-href' => sort_location}= column[:link_text]
+        - sort_location = send(path_method, params.except("sort_reverse").merge(model_name: @abstract_model.to_param, sort: property_name).merge(selected && sort_reverse != "true" ? {sort_reverse: "true"} : {}))
+        %th{class: "header pjax #{column[:css_class]} #{sort_direction if selected}", :'data-href' => sort_location}= column[:link_text]
   %tbody
     - @history.each_with_index do |object, index|
       %tr
         - unless object.created_at.nil?
-          %td= l(object.created_at, :format => :long, :default => l(object.created_at, :format => :long, :locale => :en))
+          %td= l(object.created_at, format: :long, default: l(object.created_at, format: :long, locale: :en))
         %td= object.username
         - if @general
           - if o = @abstract_model.get(object.item)
             - label = o.send(@abstract_model.config.object_label_method)
             - if show_action = action(:show, @abstract_model, o)
-              %td= link_to(label, url_for(:action => show_action.action_name, :model_name => @abstract_model.to_param, :id => o.id), :class => 'pjax')
+              %td= link_to(label, url_for(action: show_action.action_name, model_name: @abstract_model.to_param, id: o.id), class: 'pjax')
             - else
               %td= label
           - else
@@ -44,6 +44,6 @@
         %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)
-  = link_to(t("admin.misc.show_all"), send(path_method, params.merge(:all => true)), :class => "show-all btn pjax") unless (tc = @history.total_count) <= @history.size || tc > 100
+  = paginate(@history, theme: 'twitter-bootstrap', remote: true)
+  = link_to(t("admin.misc.show_all"), send(path_method, params.merge(all: true)), class: "show-all btn pjax") unless (tc = @history.total_count) <= @history.size || tc > 100