rails_admin 0.8.1 → 2.2.1

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

@@ -1,47 +1,55 @@
 - 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
 
-= 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' do
 
   %input{name: "send_data", type: "hidden", value: "true"}/
   %fieldset{id: 'fields_to_export'}
     %legend
       %i.icon-chevron-down
       = t('admin.export.select')
-    .form-group.control-group.col-sm-12
-      .controls
-        .col-sm-12
-        %label.col-sm-12.checkbox{for: 'check_all'}
-          = check_box_tag 'all', 'all', true, { id: 'check_all' }
-          = t('admin.export.select_all_fields')
-    .form-group.control-group.col-sm-12
-      %label.col-sm-12.well.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)
-      .col-sm-11.col-sm-offset-1.controls
-        - 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.col-sm-3{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.detect {|p| field.association.foreign_type == p.name }.name
-            %label.checkbox.col-sm-3{for: "schema_#{list}_#{polymorphic_type_column_name}"}
-              = check_box_tag "schema[#{list}][]", polymorphic_type_column_name, true, { id: "schema_#{list}_#{polymorphic_type_column_name}" }
-              = capitalize_first_letter(field.label) + " [type]"
-          - else
-            %label.checkbox.col-sm-3{for: "schema_#{list}_#{field.name}"}
-              = check_box_tag "schema[#{list}][]", field.name, true, { id: "schema_#{list}_#{field.name}" }
-              = capitalize_first_letter(field.label)
+    .form-group.control-group
+      .col-sm-12
+        .checkbox
+          %label{for: 'check_all'}
+            = check_box_tag 'all', 'all', true, { id: 'check_all' }
+            %b= t('admin.export.select_all_fields')
+    .form-group.control-group
+      .col-sm-12
+        .well.well-sm.reverse-selection{rel: 'tooltip', title: t('admin.export.click_to_reverse_selection'), style: 'margin: 0; cursor: pointer;'}
+          %b= t('admin.export.fields_from', name: @model_config.label_plural.downcase)
+        .controls
+          .row
+            - visible_fields.select{ |f| !f.association? || f.association.polymorphic? }.each do |field|
+              - list = field.virtual? ? 'methods' : 'only'
+              .checkbox.col-sm-3
+                - if field.association? && field.association.polymorphic?
+                  %label{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.detect {|p| field.association.foreign_type == p.name }.name
+                  %label{for: "schema_#{list}_#{polymorphic_type_column_name}"}
+                    = check_box_tag "schema[#{list}][]", polymorphic_type_column_name, true, { id: "schema_#{list}_#{polymorphic_type_column_name}" }
+                    = capitalize_first_letter(field.label) + " [type]"
+                - else
+                  %label{for: "schema_#{list}_#{field.name}"}
+                    = check_box_tag "schema[#{list}][]", field.name, true, { id: "schema_#{list}_#{field.name}" }
+                    = capitalize_first_letter(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? }
-      .form-group.control-group.col-sm-12
-        %label.col-sm-12.well.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)
-        .col-sm-11.col-sm-offset-1.controls
-          - fields.each do |associated_model_field|
-            - list = associated_model_field.virtual? ? 'methods' : 'only'
-            %label.checkbox.col-sm-3{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}" }
-              = capitalize_first_letter(associated_model_field.label)
+      .form-group.control-group
+        .col-sm-12
+          .well.well-sm.reverse-selection{rel: 'tooltip', title: t('admin.export.click_to_reverse_selection'), style: 'margin: 0; cursor: pointer;'}
+            %b= t('admin.export.fields_from_associated', name: field.label.downcase)
+          .controls
+            .row
+              - fields.each do |associated_model_field|
+                - list = associated_model_field.virtual? ? 'methods' : 'only'
+                .checkbox.col-sm-3
+                  %label{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}" }
+                    = capitalize_first_letter(associated_model_field.label)
 
   %fieldset
     %legend
@@ -52,20 +60,21 @@
       %label.col-sm-2.control-label{for: "csv_options_encoding_to"}= t('admin.export.csv.encoding_to')
       .col-sm-10.controls
         -# from http://books.google.com/support/partner/bin/answer.py?answer=30990 :
-        = select_tag 'csv_options[encoding_to]', options_for_select(RailsAdmin::CSVConverter::TARGET_ENCODINGS), include_blank: true
+        = select_tag 'csv_options[encoding_to]', options_for_select(Encoding.name_list.sort), include_blank: true, placeholder: t('admin.misc.search'), :'data-enumeration' => true
         %p.help-block= t('admin.export.csv.encoding_to_help', name: guessed_encoding)
 
     .form-group.control-group
       %label.col-sm-2.control-label{for: "csv_options_skip_header"}= t('admin.export.csv.skip_header')
       .col-sm-10.controls
-        %label.checkbox
-          = check_box_tag 'csv_options[skip_header]', 'true'
+        .checkbox
+          %label{style: 'display: block;' }
+            = check_box_tag 'csv_options[skip_header]', 'true'
         %p.help-block= t('admin.export.csv.skip_header_help')
 
     .form-group.control-group
       %label.col-sm-2.control-label{for: "csv_options_generator_col_sep"}= t('admin.export.csv.col_sep')
       .col-sm-10.controls
-        = select_tag 'csv_options[generator][col_sep]', options_for_select({ '' => t('admin.export.csv.default_col_sep'), "<comma> ','" => ',', "<semicolon> ';'" => ';', '<tabs>' => "'\t'" })
+        = select_tag 'csv_options[generator][col_sep]', options_for_select({ '' => t('admin.export.csv.default_col_sep'), "<comma> ','" => ',', "<semicolon> ';'" => ';', '<tabs>' => "'\t'" }), placeholder: t('admin.misc.search'), :'data-enumeration' => true
         %p.help-block= t('admin.export.csv.col_sep_help', value: t('admin.export.csv.default_col_sep'))
 
   .form-group.form-actions

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

@@ -10,7 +10,7 @@
     .input-group
       %input.form-control.input-small{name: "query", type: "search", value: query, placeholder: "#{t("admin.misc.filter")}", class: 'input-small'}
       %span.input-group-btn
-        %button.btn.btn-primary{type: "submit", :'data-disable-with' => "<i class='icon-white icon-refresh'></i> ".html_safe + t("admin.misc.refresh")}
+        %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
@@ -32,7 +32,7 @@
     - @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))
         %td= object.username
         - if @general
           - if o = @abstract_model.get(object.item)
@@ -46,6 +46,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)
+  = paginate(@history, theme: 'ra-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
 

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

@@ -10,14 +10,18 @@
   export_action = nil unless export_action && authorized?(export_action.authorization_key, @abstract_model)
   description = RailsAdmin.config(@abstract_model.model_name).description
   properties = @model_config.list.with(controller: self.controller, view: self, object: @abstract_model.model.new).visible_fields
+  checkboxes = @model_config.list.checkboxes?
   # columns paginate
-  sets = get_column_sets(properties)
-  properties = sets[params[:set].to_i] || []
-  other_left = ((params[:set].to_i - 1) >= 0) && sets[params[:set].to_i - 1].present?
-  other_right = sets[params[:set].to_i + 1].present?
+  unless (frozen_columns = @model_config.list.sidescroll_frozen_columns)
+    sets = get_column_sets(properties)
+    properties = sets[params[:set].to_i] || []
+    other_left = ((params[:set].to_i - 1) >= 0) && sets[params[:set].to_i - 1].present?
+    other_right = sets[params[:set].to_i + 1].present?
+  end
 
 - content_for :contextual_tabs do
-  = bulk_menu
+  - if checkboxes
+    = bulk_menu
   - if filterable_fields.present?
     %li.dropdown{style: 'float:right'}
       %a.dropdown-toggle{href: '#', :'data-toggle' => "dropdown"}
@@ -31,12 +35,7 @@
           - else
             - ''
           %li
-            %a{href: '#', :"data-field-label" => field.label, :"data-field-name" => field.name, :"data-field-options" => field_options.html_safe, :"data-field-type" => field.type, :"data-field-value" => "", :"data-field-datetimepicker-format" => (field.try(:parser) && field.parser.to_momentjs)}= capitalize_first_letter(field.label)
-
-:javascript
-  jQuery(function($) {
-  #{ordered_filter_string}
-  });
+            %a{href: '#', :"data-field-label" => field.label, :"data-field-name" => field.name, :"data-field-operator" => field.default_filter_operator, :"data-field-options" => field_options.html_safe, :"data-field-required" => field.required.to_s, :"data-field-type" => field.type, :"data-field-value" => "", :"data-field-datetimepicker-format" => (field.try(:parser) && field.parser.to_momentjs)}= capitalize_first_letter(field.label)
 
 %style
   - properties.select{ |p| p.column_width.present? }.each do |property|
@@ -46,15 +45,15 @@
 #list
   = form_tag(index_path(params.except(*%w[page f query])), method: :get, class: "pjax-form form-inline") do
     .well
-      %span#filters_box
+      %span#filters_box{data: {options: ordered_filter_options.to_json}}
       %hr.filters_box{style: "display:#{ordered_filters.empty? ? 'none' : 'block'}"}
       .input-group
         %input.form-control.input-small{name: "query", type: "search", value: query, placeholder: t("admin.misc.filter")}
         %span.input-group-btn
-          %button.btn.btn-primary{type: "submit", :'data-disable-with' => "<i class='icon-white icon-refresh'></i> ".html_safe + t("admin.misc.refresh")}
+          %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")
-          %button#remove_filter.btn.btn-info{title: "Reset filters"}
+            = t('admin.misc.refresh')
+          %button#remove_filter.btn.btn-info{title: t('admin.misc.reset_filters')}
             %i.icon-white.icon-remove
       - if export_action
         %span{style: 'float:right'}= link_to wording_for(:link, export_action), export_path(params.except('set').except('page')), class: 'btn btn-info'
@@ -66,7 +65,7 @@
         %li{class: "#{'active' if scope.to_s == params[:scope] || (params[:scope].blank? && index == 0)}"}
           %a{href: index_path(params.merge(scope: scope, page: nil)), class: 'pjax'}= I18n.t("admin.scopes.#{@abstract_model.to_param}.#{scope}", default: I18n.t("admin.scopes.#{scope}", default: scope.to_s.titleize))
 
-  = form_tag bulk_action_path(model_name: @abstract_model.to_param), method: :post, id: "bulk_form", class: "form" do
+  = form_tag bulk_action_path(model_name: @abstract_model.to_param), method: :post, id: "bulk_form", class: ["form", frozen_columns ? 'ra-sidescroll' : nil], data: (frozen_columns ? {ra_sidescroll: frozen_columns} : {}) do
     = hidden_field_tag :bulk_action
     - if description.present?
       %p
@@ -75,8 +74,11 @@
     %table.table.table-condensed.table-striped
       %thead
         %tr
-          %th.shrink
-            %input.toggle{type: "checkbox"}
+          - if checkboxes
+            %th.shrink
+              %input.toggle{type: "checkbox"}
+          - if frozen_columns
+            %th.last.shrink
           - if other_left
             %th.other.left.shrink= "..."
           - properties.each do |property|
@@ -87,12 +89,16 @@
             %th{class: "#{property.sortable && "header pjax" || nil} #{sort_direction if property.sortable && sort_direction} #{property.css_class} #{property.type_css_class}", :'data-href' => (property.sortable && sort_location), rel: "tooltip", title: "#{property.hint}"}= capitalize_first_letter(property.label)
           - if other_right
             %th.other.right.shrink= "..."
-          %th.last.shrink
+          - unless frozen_columns
+            %th.last.shrink
       %tbody
         - @objects.each do |object|
-          %tr{class: "#{@abstract_model.param_key}_row"}
-            %td
-              = check_box_tag "bulk_ids[]", object.id, false
+          %tr{class: "#{@abstract_model.param_key}_row #{@model_config.list.with(object: object).row_css_class}"}
+            - if checkboxes
+              %td= check_box_tag "bulk_ids[]", object.id, false
+            - if frozen_columns
+              %td.last.links
+                %ul.inline.list-inline= menu_for :member, @abstract_model, object, true
             - if @other_left_link ||= other_left && index_path(params.except('set').merge(params[:set].to_i != 1 ? {set: (params[:set].to_i - 1)} : {}))
               %td.other.left= link_to "...", @other_left_link, class: 'pjax'
             - properties.map{ |property| property.bind(:object, object) }.each do |property|
@@ -100,13 +106,18 @@
               %td{class: "#{property.css_class} #{property.type_css_class}", title: strip_tags(value.to_s)}= value
             - if @other_right_link ||= other_right && index_path(params.merge(set: (params[:set].to_i + 1)))
               %td.other.right= link_to "...", @other_right_link, class: 'pjax'
-            %td.last.links
-              %ul.inline.list-inline= menu_for :member, @abstract_model, object, true
+            - unless frozen_columns
+              %td.last.links
+                %ul.inline.list-inline= menu_for :member, @abstract_model, object, true
+
+    - if @model_config.list.limited_pagination
+      .row
+        .col-md-6= paginate(@objects, theme: 'ra-twitter-bootstrap/without_count', total_pages: Float::INFINITY, remote: true)
 
-    - if @objects.respond_to?(:total_count)
+    - elsif @objects.respond_to?(:total_count)
       - total_count = @objects.total_count.to_i
       .row
-        .col-md-6= paginate(@objects, theme: 'twitter-bootstrap', remote: true)
+        .col-md-6= paginate(@objects, theme: 'ra-twitter-bootstrap', remote: true)
       .row
         .col-md-6= link_to(t("admin.misc.show_all"), index_path(params.merge(all: true)), class: "show-all btn btn-default clearfix pjax") unless total_count > 100 || total_count <= @objects.to_a.size
       .clearfix.total-count= "#{total_count} #{@model_config.pluralize(total_count).downcase}"

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

@@ -1,6 +1,6 @@
 - @model_config.show.with(object: @object, view: self, controller: self.controller).visible_groups.each do |fieldset|
   - unless (fields = fieldset.with(object: @object, view: self, controller: self.controller).visible_fields).empty?
-    - if !(values = fields.map{ |f| f.formatted_value.presence }).compact.empty? || !RailsAdmin::config.compact_show_view
+    - unless (fields = fields.reject{ |f| RailsAdmin::config.compact_show_view && (f.formatted_value.nil? || f.formatted_value == '') }).empty?
       .fieldset
         %h4
           = fieldset.label
@@ -8,9 +8,8 @@
           %p= fieldset.help
         %dl
           - fields.each_with_index do |field, index|
-            - unless values[index].nil? && RailsAdmin::config.compact_show_view
-              %dt
-                %span.label.label-info{class: "#{field.type_css_class} #{field.css_class}"}
-                  = field.label
-              %dd.well
-                = field.pretty_value
+            %dt
+              %span.label.label-info{class: "#{field.type_css_class} #{field.css_class}"}
+                = field.label
+            %dd.well
+              = field.pretty_value

data/config/initializers/active_record_extensions.rb

@@ -1,4 +1,4 @@
-if defined?(::ActiveRecord)
+ActiveSupport.on_load(:active_record) do
   module ActiveRecord
     class Base
       def self.rails_admin(&block)
@@ -6,11 +6,11 @@ if defined?(::ActiveRecord)
       end
 
       def rails_admin_default_object_label_method
-        self.new_record? ? "new #{self.class}" : "#{self.class} ##{id}"
+        new_record? ? "new #{self.class}" : "#{self.class} ##{id}"
       end
 
       def safe_send(value)
-        if self.has_attribute?(value)
+        if has_attribute?(value)
           read_attribute(value)
         else
           send(value)

data/config/initializers/haml.rb

@@ -1,2 +1,5 @@
 require 'haml'
-Haml::Template.options[:ugly] = true
+require 'haml/template'
+if Haml::Options.buffer_option_keys.include?(:ugly)
+  Haml::Template.options[:ugly] = true
+end

data/config/locales/rails_admin.en.yml

@@ -29,21 +29,24 @@ en:
     misc:
       search: "Search"
       filter: "Filter"
+      reset_filters: "Reset filters"
       refresh: "Refresh"
       show_all: "Show all"
       add_filter: "Add filter"
       bulk_menu_title: "Selected items"
       remove: "Remove"
       add_new: "Add new"
-      chosen: "Chosen %{name}"
       chose_all: "Choose all"
       clear_all: "Clear all"
       up: "Up"
       down: "Down"
       navigation: "Navigation"
+      root_navigation: "Actions"
       navigation_static_label: "Links"
       log_out: "Log out"
+      time_ago: "%{time} ago"
       ago: "ago"
+      more: "Plus %{count} more %{models_name}"
     flash:
       successful: "%{name} successfully %{action}"
       error: "%{name} failed to be %{action}"
@@ -52,7 +55,7 @@ en:
       object_not_found: "%{model} with id '%{id}' could not be found"
     table_headers:
       model_name: "Model name"
-      last_used: "Last used"
+      last_created: "Last created"
       records: "Records"
       username: "User"
       changes: "Changes"

data/lib/generators/rails_admin/templates/initializer.erb

@@ -8,8 +8,8 @@ RailsAdmin.config do |config|
   # end
   # config.current_user_method(&:current_user)
 
-  ## == Cancan ==
-  # config.authorize_with :cancan
+  ## == CancanCan ==
+  # config.authorize_with :cancancan
 
   ## == Pundit ==
   # config.authorize_with :pundit
@@ -19,6 +19,10 @@ RailsAdmin.config do |config|
 
   ### More at https://github.com/sferik/rails_admin/wiki/Base-configuration
 
+  ## == Gravatar integration ==
+  ## To disable Gravatar integration in Navigation Bar set to false
+  # config.show_gravatar = true
+
   config.actions do
     dashboard                     # mandatory
     index                         # mandatory

data/lib/rails_admin/abstract_model.rb

@@ -46,7 +46,7 @@ module RailsAdmin
     def initialize(model_or_model_name)
       @model_name = model_or_model_name.to_s
       ancestors = model.ancestors.collect(&:to_s)
-      if ancestors.include?('ActiveRecord::Base') && !model.abstract_class?
+      if ancestors.include?('ActiveRecord::Base') && !model.abstract_class? && model.table_exists?
         initialize_active_record
       elsif ancestors.include?('Mongoid::Document')
         initialize_mongoid
@@ -87,12 +87,11 @@ module RailsAdmin
         case association.type
         when :has_one
           if child = object.send(association.name)
-            yield(association, child)
+            yield(association, [child])
           end
         when :has_many
-          object.send(association.name).each do |child| # rubocop:disable ShadowingOuterLocalVariable
-            yield(association, child)
-          end
+          children = object.send(association.name)
+          yield(association, Array.new(children))
         end
       end
     end
@@ -147,7 +146,7 @@ module RailsAdmin
       end
 
       def build_statement_for_type
-        fail('You must override build_statement_for_type in your StatementBuilder')
+        raise('You must override build_statement_for_type in your StatementBuilder')
       end
 
       def build_statement_for_integer_decimal_or_float
@@ -179,17 +178,17 @@ module RailsAdmin
 
       def build_statement_for_datetime_or_timestamp
         start_date, end_date = get_filtering_duration
-        start_date = start_date.to_time.try(:beginning_of_day) if start_date
-        end_date = end_date.to_time.try(:end_of_day) if end_date
+        start_date = start_date.try(:beginning_of_day) if start_date
+        end_date = end_date.try(:end_of_day) if end_date
         range_filter(start_date, end_date)
       end
 
       def unary_operators
-        fail('You must override unary_operators in your StatementBuilder')
+        raise('You must override unary_operators in your StatementBuilder')
       end
 
       def range_filter(_min, _max)
-        fail('You must override range_filter in your StatementBuilder')
+        raise('You must override range_filter in your StatementBuilder')
       end
 
       class FilteringDuration

data/lib/rails_admin/adapters/active_record/abstract_object.rb

@@ -20,11 +20,17 @@ module RailsAdmin
         end
 
         def save(options = {validate: true})
-          object.save(options)
+          object.save(**options)
         end
 
-        def method_missing(name, *args, &block)
-          object.send(name, *args, &block)
+        if RUBY_VERSION >= '2.7'
+          def method_missing(method_name, *args, **kwargs, &block)
+            object.send(method_name, *args, **kwargs, &block)
+          end
+        else
+          def method_missing(method_name, *args, &block)
+            object.send(method_name, *args, &block)
+          end
         end
       end
     end

data/lib/rails_admin/adapters/active_record/property.rb

@@ -48,11 +48,7 @@ module RailsAdmin
       private
 
         def serialized?
-          if Rails.version < '4.2'
-            model.serialized_attributes[property.name.to_s]
-          else
-            model.type_for_attribute(property.name).class == ::ActiveRecord::Type::Serialized
-          end
+          model.type_for_attribute(property.name).class == ::ActiveRecord::Type::Serialized
         end
       end
     end