rails_admin 1.4.3 → 2.0.2

data/app/assets/javascripts/rails_admin/ui.js

@@ -0,0 +1,135 @@
+(function($) {
+  $(document).on("click", "#list input.toggle", function() {
+    $("#list [name='bulk_ids[]']").prop("checked", $(this).is(":checked"));
+  });
+
+  $(document).on('click', '.pjax', function(event) {
+    if (event.which > 1 || event.metaKey || event.ctrlKey) {
+        return;
+    }
+
+    if ($.support.pjax) {
+      event.preventDefault();
+      $.pjax({
+        container: $(this).data('pjax-container') || '[data-pjax-container]',
+        url: $(this).data('href') || $(this).attr('href'),
+        timeout: 2000
+      });
+      return;
+    }
+
+    if ($(this).data('href')) {
+      window.location = $(this).data('href');
+    }
+  });
+
+  $(document).on('submit', '.pjax-form', function(event) {
+    if ($.support.pjax) {
+      event.preventDefault();
+      $.pjax({
+        container: $(this).data('pjax-container') || '[data-pjax-container]',
+        url: this.action + (this.action.indexOf('?') !== -1 ? '&' : '?') + $(this).serialize(),
+        timeout: 2000
+      });
+    }
+  });
+
+  $(document).on('pjax:start', function() {
+    return $('#loading').show();
+  }).on('pjax:end', function() {
+    return $('#loading').hide();
+  });
+
+  $(document).on('click', '[data-target]', function() {
+    if (!$(this).hasClass('disabled')) {
+      if ($(this).has('i.icon-chevron-down').length) {
+        $(this).removeClass('active').children('i').toggleClass('icon-chevron-down icon-chevron-right');
+        $($(this).data('target')).select(':visible').hide('slow');
+      } else {
+        if ($(this).has('i.icon-chevron-right').length) {
+          $(this).addClass('active').children('i').toggleClass('icon-chevron-down icon-chevron-right');
+          $($(this).data('target')).select(':hidden').show('slow');
+        }
+      }
+    }
+  });
+
+  $(document).on('click', '.form-horizontal legend', function() {
+    if ($(this).has('i.icon-chevron-down').length) {
+      $(this).siblings('.control-group:visible').hide('slow');
+      $(this).children('i').toggleClass('icon-chevron-down icon-chevron-right');
+    } else {
+      if ($(this).has('i.icon-chevron-right').length) {
+        $(this).siblings('.control-group:hidden').show('slow');
+        $(this).children('i').toggleClass('icon-chevron-down icon-chevron-right');
+      }
+    }
+  });
+
+  $(document).on('click', 'form .tab-content .tab-pane a.remove_nested_one_fields', function() {
+    $(this).children('input[type="hidden"]').val($(this).hasClass('active')).siblings('i').toggleClass('icon-check icon-trash');
+  });
+
+  $(document).ready(function() {
+    RailsAdmin.I18n.init($('html').attr('lang'), $("#admin-js").data('i18nOptions'));
+    $(document).trigger('rails_admin.dom_ready');
+  });
+
+  $(document).on('pjax:end', function() {
+    $(document).trigger('rails_admin.dom_ready');
+  });
+
+  $(document).on('rails_admin.dom_ready', function() {
+    $('.nav.nav-pills li.active').removeClass('active');
+    $(".nav.nav-pills li[data-model=\"" + ($('.page-header').data('model')) + "\"]").addClass('active');
+    $('.animate-width-to').each(function() {
+      var length, width;
+      length = $(this).data("animate-length");
+      width = $(this).data("animate-width-to");
+      $(this).animate({
+        width: width
+      }, length, 'easeOutQuad');
+    });
+    $('.form-horizontal legend').has('i.icon-chevron-right').each(function() {
+      $(this).siblings('.control-group').hide();
+    });
+    $(".table").tooltip({
+      selector: "th[rel=tooltip]"
+    });
+    $('[formnovalidate]').on('click', function() {
+      $(this).closest('form').attr('novalidate', true);
+    });
+    $.each($('#filters_box').data('options'), function() {
+      $.filters.append(this);
+    });
+  });
+
+  $(document).on('click', ".bulk-link", function(event) {
+    event.preventDefault();
+    $('#bulk_action').val($(this).data('action'));
+    $('#bulk_form').submit();
+  });
+
+  $(document).on('click', "#remove_filter", function(event) {
+    event.preventDefault();
+    $("#filters_box").html("");
+    $("hr.filters_box").hide();
+    $(this).parent().siblings("input[type='search']").val("");
+    $(this).parents("form").submit();
+  });
+
+  $(document).on('click', '#fields_to_export label input#check_all', function() {
+    var elems;
+    elems = $('#fields_to_export label input');
+    if ($('#fields_to_export label input#check_all').is(':checked')) {
+      $(elems).prop('checked', true);
+    } else {
+      $(elems).prop('checked', false);
+    }
+  });
+
+  $(document).on('click', '#fields_to_export .reverse-selection', function() {
+    $(this).closest(".control-group").find(".controls").find("input").click();
+  });
+
+}(jQuery));

data/app/assets/stylesheets/rails_admin/ra.sidescroll.scss

@@ -0,0 +1,29 @@
+.ra-sidescroll {
+  margin-bottom: 20px;
+  overflow-x: auto;
+  .table {
+    margin-bottom: 0;
+  }
+
+  .ra-sidescroll-frozen {
+    position: sticky;
+
+    // border-right isn't sticky
+    &.last-of-frozen {
+      box-shadow: -1px 0 0 0 $table-border-color inset;
+      padding-right: $table-condensed-cell-padding + 1px;
+    }
+  }
+
+  // Remove transparency on frozen cells.
+  $table-bg-default: if($table-bg == transparent, if($body-bg == transparent, #fff, $body-bg), $table-bg) !default;
+  .table-striped > tbody > tr:nth-child(even) > td, .table-striped > thead > tr > th {
+    background-color: $table-bg-default;
+  }
+  $table-bg-header-sort: #e2eff6 !default;
+  .table .ra-sidescroll-frozen {
+    &.headerSortUp, &.headerSortDown {
+      background-color: $table-bg-header-sort;
+    }
+  }
+}

data/app/assets/stylesheets/rails_admin/ra.widgets.scss

@@ -11,3 +11,7 @@ iframe.wysihtml5-sandbox, .wysihtml5-editor{
   max-height: 200px;
   max-width: 300px;
 }
+
+.controls.ui-sortable .sortables{
+  cursor: move;
+}

data/app/assets/stylesheets/rails_admin/rails_admin.scss.erb

@@ -55,12 +55,13 @@
 @import "rails_admin/bootstrap-datetimepicker-build";
 @import "rails_admin/ra.filtering-multiselect";
 @import "rails_admin/ra.widgets";
+@import "rails_admin/ra.sidescroll";
 @import "rails_admin/jquery.colorpicker";
 
 
 /*** Font-awesome ***/
 
-@import 'font-awesome';
+@import 'rails_admin/font-awesome';
 @import 'rails_admin/base/font-awesome-4-compability';
 
 /***  Bootstrap Theming  ***/

data/app/controllers/rails_admin/application_controller.rb

@@ -11,6 +11,8 @@ module RailsAdmin
   end
 
   class ApplicationController < Config.parent_controller.constantize
+    include RailsAdmin::Extensions::ControllerExtension
+
     protect_from_forgery(Config.forgery_protection_settings)
 
     before_action :_authenticate!

data/app/helpers/rails_admin/application_helper.rb

@@ -84,9 +84,24 @@ module RailsAdmin
       end.join.html_safe
     end
 
+    def root_navigation
+      actions(:root).select(&:show_in_sidebar).group_by(&:sidebar_label).collect do |label, nodes|
+        li_stack = nodes.map do |node|
+          url = rails_admin.url_for(action: node.action_name, controller: "rails_admin/main")
+          nav_icon = node.link_icon ? %(<i class="#{node.link_icon}"></i>).html_safe : ''
+          content_tag :li do
+            link_to nav_icon + " " + wording_for(:menu, node), url, class: "pjax"
+          end
+        end.join.html_safe
+        label ||= t('admin.misc.root_navigation')
+
+        %(<li class='dropdown-header'>#{capitalize_first_letter label}</li>#{li_stack}) if li_stack.present?
+      end.join.html_safe
+    end
+
     def static_navigation
       li_stack = RailsAdmin::Config.navigation_static_links.collect do |title, url|
-        content_tag(:li, link_to(title.to_s, url, target: '_blank'))
+        content_tag(:li, link_to(title.to_s, url, target: '_blank', rel: 'noopener noreferrer'))
       end.join
 
       label = RailsAdmin::Config.navigation_static_label || t('admin.misc.navigation_static_label')
@@ -110,7 +125,7 @@ module RailsAdmin
     def breadcrumb(action = @action, _acc = [])
       begin
         (parent_actions ||= []) << action
-      end while action.breadcrumb_parent && (action = action(*action.breadcrumb_parent)) # rubocop:disable Loop
+      end while action.breadcrumb_parent && (action = action(*action.breadcrumb_parent)) # rubocop:disable Lint/Loop
 
       content_tag(:ol, class: 'breadcrumb') do
         parent_actions.collect do |a|
@@ -138,7 +153,7 @@ module RailsAdmin
 
     # parent => :root, :collection, :member
     def menu_for(parent, abstract_model = nil, object = nil, only_icon = false) # perf matters here (no action view trickery)
-      actions = actions(parent, abstract_model, object).select { |a| a.http_methods.include?(:get) }
+      actions = actions(parent, abstract_model, object).select { |a| a.http_methods.include?(:get) && a.show_in_menu }
       actions.collect do |action|
         wording = wording_for(:menu, action)
         %(
@@ -160,7 +175,7 @@ module RailsAdmin
           content_tag(:ul, class: 'dropdown-menu', style: 'left:auto; right:0;') do
             actions.collect do |action|
               content_tag :li do
-                link_to wording_for(:bulk_link, action), '#', onclick: "jQuery('#bulk_action').val('#{action.action_name}'); jQuery('#bulk_form').submit(); return false;"
+                link_to wording_for(:bulk_link, action, abstract_model), '#', class: 'bulk-link', data: {action: action.action_name}
               end
             end.join.html_safe
           end

data/app/helpers/rails_admin/main_helper.rb

@@ -56,8 +56,8 @@ module RailsAdmin
       end.to_a.sort_by(&:first)
     end
 
-    def ordered_filter_string
-      @ordered_filter_string ||= ordered_filters.map do |duplet|
+    def ordered_filter_options
+      @ordered_filter_options ||= ordered_filters.map do |duplet|
         options = {index: duplet[0]}
         filter_for_field = duplet[1]
         filter_name = filter_for_field.keys.first
@@ -77,8 +77,8 @@ module RailsAdmin
         options[:value] = filter_hash['v']
         options[:label] = field.label
         options[:operator] = filter_hash['o']
-        %{$.filters.append(#{options.to_json});}
-      end.join("\n").html_safe if ordered_filters
+        options
+      end if ordered_filters
     end
   end
 end

data/app/views/layouts/rails_admin/_head.html.haml

@@ -0,0 +1,7 @@
+%meta{content: "IE=edge", "http-equiv" => "X-UA-Compatible"}
+%meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
+%meta{content: "width=device-width, initial-scale=1", name: "viewport; charset=utf-8"}
+%meta{content: "NONE,NOARCHIVE", name: "robots"}
+= csrf_meta_tag
+= stylesheet_link_tag "rails_admin/rails_admin.css", media: :all
+= javascript_include_tag "rails_admin/rails_admin.js"

data/app/views/layouts/rails_admin/_secondary_navigation.html.haml

@@ -1,5 +1,5 @@
 %ul.nav.navbar-nav.navbar-right.root_links
-  - actions(:root).each do |action|
+  - actions(:root).select(&:show_in_navigation).each do |action|
     %li{class: "#{action.action_name}_root_link"}= link_to wording_for(:menu, action), { action: action.action_name, controller: 'rails_admin/main' }, class: action.pjax? ? "pjax" : ""
   - if main_app_root_path = (main_app.root_path rescue false)
     %li= link_to t('admin.home.name'), main_app_root_path

data/app/views/layouts/rails_admin/_sidebar_navigation.html.haml

@@ -1,2 +1,3 @@
 %ul.nav.nav-pills.nav-stacked= main_navigation
-%ul.nav.nav-pills.nav-stacked= static_navigation
+%ul.nav.nav-pills.nav-stacked= root_navigation
+%ul.nav.nav-pills.nav-stacked= static_navigation

data/app/views/layouts/rails_admin/application.html.haml

@@ -1,18 +1,9 @@
 !!! 5
 %html{lang: I18n.locale}
   %head
-    %meta{content: "IE=edge", "http-equiv" => "X-UA-Compatible"}
-    %meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
-    %meta{content: "width=device-width, initial-scale=1", name: "viewport; charset=utf-8"}
-    %meta{content: "NONE,NOARCHIVE", name: "robots"}
-    = csrf_meta_tag
-    = stylesheet_link_tag "rails_admin/rails_admin.css", media: :all
-    = javascript_include_tag "rails_admin/rails_admin.js"
+    = render "layouts/rails_admin/head"
   %body.rails_admin
     #admin-js{:'data-i18n-options' => I18n.t("admin.js").to_json}
-    -# Initialize JS simple i18n
-    :javascript
-      RailsAdmin.I18n.init('#{I18n.locale}', document.getElementById("admin-js").dataset.i18nOptions);
     #loading.label.label-warning{style: 'display:none; position:fixed; right:20px; bottom:20px; z-index:100000'}= t('admin.loading')
     %nav.navbar.navbar-default.navbar-fixed-top
       = render "layouts/rails_admin/navigation"
@@ -21,4 +12,5 @@
         .col-sm-3.col-md-2.sidebar-nav
           = render "layouts/rails_admin/sidebar_navigation"
         .col-sm-9.col-sm-offset-3.col-md-10.col-md-offset-2
-          .content{:'data-pjax-container' => true}= render template: 'layouts/rails_admin/pjax'
+          .content{:'data-pjax-container' => true}
+            = render template: 'layouts/rails_admin/pjax'

data/app/views/layouts/rails_admin/pjax.html.haml

@@ -1,9 +1,5 @@
-:javascript
-  $('.nav.nav-pills li.active').removeClass('active');
-  $('.nav.nav-pills li[data-model="#{@abstract_model.to_param}"]').addClass('active');
-
 %title= "#{@abstract_model.try(:pretty_name) || @page_name} | #{[_get_plugin_name[0] || 'Rails', _get_plugin_name[1] || 'Admin'].join(' ')}"
-.page-header
+.page-header{data: {model: @abstract_model.to_param}}
   %h1= @page_name
 - flash && flash.each do |key, value|
   .alert.alert-dismissible{class: flash_alert_class(key)}

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

@@ -0,0 +1,7 @@
+:ruby
+  js_data = {
+    csspath: field.css_location,
+    jspath: field.js_location
+  }
+
+= form.rich_text_area field.method_name, field.html_attributes.reverse_merge(data: { options: js_data.to_json })

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

@@ -1,5 +1,8 @@
 - file = field.value
 
+- if field.cache_method
+  = form.hidden_field(field.cache_method, value: field.cache_value)
+
 .toggle{style: ('display:none;' if file && field.delete_method && form.object.send(field.delete_method) == '1')}
   - if value = field.pretty_value
     = value
@@ -7,11 +10,8 @@
   = 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.btn-remove-image{href: '#', :'data-toggle' => 'button', role: '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.btn-remove-image{href: '#', :'data-toggle' => 'button', role: 'button'}
     %i.icon-white.icon-trash
     = I18n.t('admin.actions.delete.menu').capitalize + " #{field.label.downcase}"
 
   = 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_select.html.haml

@@ -26,7 +26,7 @@
   }
 
 - 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'), style: "float: left" })
 
 - if authorized?(:new, config.abstract_model) && field.inline_add
   - path_hash = { model_name: config.abstract_model.to_param, modal: true }

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

@@ -1,12 +1,14 @@
 - field.attachments.each_with_index do |attachment, i|
-  .toggle
+  .toggle{class: field.reorderable? ? 'sortables' : ''}
     = attachment.pretty_value
-    - if field.delete_method
-      %a.btn.btn-info.btn-remove-image{href: '#', :'data-toggle' => 'button', role: 'button', onclick: "$(this).siblings('[type=checkbox]').click(); $(this).parent('.toggle').toggle('slow'); jQuery(this).toggleClass('btn-danger btn-info'); return false;"}
+    - if field.delete_method || field.keep_method
+      %a.btn.btn-info.btn-remove-image{href: '#', :'data-toggle' => 'button', role: 'button'}
         %i.icon-white.icon-trash
         = I18n.t('admin.actions.delete.menu').capitalize + " #{field.label.downcase} ##{i + 1}"
-
-    = form.check_box(field.delete_method, {multiple:true, style: 'display:none;'}, attachment.delete_key, nil)
+      - if field.keep_method
+        = form.check_box(field.keep_method, {multiple:true, checked: true, style: 'display:none;'}, attachment.keep_value, nil)
+      - elsif field.delete_method
+        = form.check_box(field.delete_method, {multiple:true, style: 'display:none;'}, attachment.delete_value, nil)
 
 = form.file_field(field.name, field.html_attributes.reverse_merge({ data: { :"multiple-fileupload" => true }, multiple: true }))
 

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

@@ -2,10 +2,25 @@
   type_collection = field.polymorphic_type_collection
   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)
+  collection = selected ? [[field.formatted_value, selected.id]] : [[]]
   column_type_dom_id = form.dom_id(field).sub(field.method_name.to_s, type_column)
+  current_action = params[:action].in?(['create', 'new']) ? 'create' : 'update'
+
+  default_options = { float_left: false }
+
+  js_data = type_collection.inject({}) do |options, model|
+    model_name = model.second.underscore.downcase
+    source_abstract_model = RailsAdmin.config(form.object.class).abstract_model
+    options.merge(model_name.gsub("_", "") => {
+      xhr: true,
+      remote_source: index_path(model_name, source_object_id: form.object.id, source_abstract_model: source_abstract_model.to_param, current_action: current_action, compact: true),
+      float_left: false
+    })
+  end
 
 .form-inline
-  = form.select type_column, type_collection, {include_blank: true, selected: selected_type}, class: "form-control", 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)}, class: "form-control"
+  - js_data.each do |model, value|
+    %div{id: "#{model}-js-options", data: { options: value.to_json } }
+  = form.select type_column, type_collection, {include_blank: true, selected: selected_type}, class: "form-control", id: column_type_dom_id, data: { polymorphic: true, urls: field.polymorphic_type_urls.to_json }, style: "float: left; margin-right: 10px;"
+  = form.select field.method_name, collection, {include_blank: true, selected: selected.try(:id)}, class: "form-control", data: { filteringselect: true, options: js_data[selected_type.try(:downcase)] || default_options }, placeholder: 'Search'

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

@@ -18,8 +18,7 @@
               %span.show= link_to capitalize_first_letter(abstract_model.config.label_plural), index_path, class: 'pjax'
             %td
               - if last_created
-                = time_ago_in_words last_created
-                = t "admin.misc.ago"
+                = t "admin.misc.time_ago", time: time_ago_in_words(last_created), default: "#{time_ago_in_words(last_created)} #{t("admin.misc.ago")}"
             %td
               - count = @count[abstract_model.model.name]
               - percent = count > 0 ? (@max <= 1 ? count : ((Math.log(count+1) * 100.0) / Math.log(@max+1)).to_i) : -1

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

@@ -16,7 +16,7 @@
             %b= t('admin.export.select_all_fields')
     .form-group.control-group
       .col-sm-12
-        .well.well-sm{rel: 'tooltip', :'data-original-title' => t('admin.export.click_to_reverse_selection'), onclick: 'jQuery(this).closest(".control-group").find(".controls").find("input").click()', style: 'margin: 0; cursor: pointer;'}
+        .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
@@ -40,7 +40,7 @@
       - 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
-          .well.well-sm{rel: 'tooltip', :'data-original-title' => t('admin.export.click_to_reverse_selection'), onclick: 'jQuery(this).closest(".control-group").find(".controls").find("input").click()', style: 'margin: 0; cursor: pointer;'}
+          .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

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

@@ -12,10 +12,12 @@
   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
   - if checkboxes
@@ -35,11 +37,6 @@
           %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}
-  });
-
 %style
   - properties.select{ |p| p.column_width.present? }.each do |property|
     = "#list th.#{property.css_class} { width: #{property.column_width}px; min-width: #{property.column_width}px; }"
@@ -48,7 +45,7 @@
 #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")}
@@ -56,7 +53,7 @@
           %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"}
+          %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'
@@ -68,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
@@ -80,6 +77,8 @@
           - 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|
@@ -90,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 #{@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|
@@ -103,8 +106,9 @@
               %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

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/locales/rails_admin.en.yml

@@ -29,6 +29,7 @@ en:
     misc:
       search: "Search"
       filter: "Filter"
+      reset_filters: "Reset filters"
       refresh: "Refresh"
       show_all: "Show all"
       add_filter: "Add filter"
@@ -41,8 +42,10 @@ en:
       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:

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

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
@@ -178,8 +178,8 @@ 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
 

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

@@ -23,8 +23,8 @@ module RailsAdmin
           object.save(options)
         end
 
-        def method_missing(name, *args, &block)
-          object.send(name, *args, &block)
+        def method_missing(method_name, *args, &block)
+          object.send(method_name, *args, &block)
         end
       end
     end