rails_admin 1.4.3 → 2.0.0.beta

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

@@ -7,7 +7,7 @@
   = 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}"
 

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

@@ -2,7 +2,7 @@
   .toggle
     = 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;"}
+      %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}"
 

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")}
@@ -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

@@ -43,7 +43,7 @@ en:
       navigation: "Navigation"
       navigation_static_label: "Links"
       log_out: "Log out"
-      ago: "ago"
+      time_ago: "%{time} ago"
       more: "Plus %{count} more %{models_name}"
     flash:
       successful: "%{name} successfully %{action}"

data/lib/rails_admin/adapters/active_record.rb

@@ -118,13 +118,17 @@ module RailsAdmin
       end
 
       def query_scope(scope, query, fields = config.list.fields.select(&:queryable?))
-        wb = WhereBuilder.new(scope)
-        fields.each do |field|
-          value = parse_field_value(field, query)
-          wb.add(field, value, field.search_operator)
+        if config.list.search_by
+          scope.send(config.list.search_by, query)
+        else
+          wb = WhereBuilder.new(scope)
+          fields.each do |field|
+            value = parse_field_value(field, query)
+            wb.add(field, value, field.search_operator)
+          end
+          # OR all query statements
+          wb.build
         end
-        # OR all query statements
-        wb.build
       end
 
       # filters example => {"string_field"=>{"0055"=>{"o"=>"like", "v"=>"test_value"}}, ...}

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

data/lib/rails_admin/adapters/mongoid.rb

@@ -42,8 +42,8 @@ module RailsAdmin
         scope = scope.includes(*options[:include]) if options[:include]
         scope = scope.limit(options[:limit]) if options[:limit]
         scope = scope.any_in(_id: options[:bulk_ids]) if options[:bulk_ids]
-        scope = scope.where(query_conditions(options[:query])) if options[:query]
-        scope = scope.where(filter_conditions(options[:filters])) if options[:filters]
+        scope = query_scope(scope, options[:query]) if options[:query]
+        scope = filter_scope(scope, options[:filters]) if options[:filters]
         if options[:page] && options[:per]
           scope = scope.send(Kaminari.config.page_method_name, options[:page]).per(options[:per])
         end
@@ -104,7 +104,6 @@ module RailsAdmin
         conditions_per_collection = {}
         field.searchable_columns.each do |column_infos|
           collection_name, column_name = parse_collection_name(column_infos[:column])
-          value = parse_field_value(field, value)
           statement = build_statement(column_name, column_infos[:type], value, operator)
           next unless statement
           conditions_per_collection[collection_name] ||= []
@@ -113,21 +112,25 @@ module RailsAdmin
         conditions_per_collection
       end
 
-      def query_conditions(query, fields = config.list.fields.select(&:queryable?))
-        statements = []
+      def query_scope(scope, query, fields = config.list.fields.select(&:queryable?))
+        if config.list.search_by
+          scope.send(config.list.search_by, query)
+        else
+          statements = []
 
-        fields.each do |field|
-          value = parse_field_value(field, query)
-          conditions_per_collection = make_field_conditions(field, value, field.search_operator)
-          statements.concat make_condition_for_current_collection(field, conditions_per_collection)
-        end
+          fields.each do |field|
+            value = parse_field_value(field, query)
+            conditions_per_collection = make_field_conditions(field, value, field.search_operator)
+            statements.concat make_condition_for_current_collection(field, conditions_per_collection)
+          end
 
-        statements.any? ? {'$or' => statements} : {}
+          scope.where(statements.any? ? {'$or' => statements} : {})
+        end
       end
 
       # filters example => {"string_field"=>{"0055"=>{"o"=>"like", "v"=>"test_value"}}, ...}
       # "0055" is the filter index, no use here. o is the operator, v the value
-      def filter_conditions(filters, fields = config.list.fields.select(&:filterable?))
+      def filter_scope(scope, filters, fields = config.list.fields.select(&:filterable?))
         statements = []
 
         filters.each_pair do |field_name, filters_dump|
@@ -145,7 +148,7 @@ module RailsAdmin
           end
         end
 
-        statements.any? ? {'$and' => statements} : {}
+        scope.where(statements.any? ? {'$and' => statements} : {})
       end
 
       def parse_collection_name(column)

data/lib/rails_admin/bootstrap-sass.rb

@@ -17,8 +17,10 @@ module RailsAdmin
         raise(Bootstrap::FrameworkNotFound.new('bootstrap-sass requires either Rails > 3.1 or Compass, neither of which are loaded'))
       end
 
-      stylesheets = File.expand_path(File.join('..', 'vendor', 'assets', 'stylesheets'))
-      ::Sass.load_paths << stylesheets
+      if defined?(::Sass) && ::Sass.respond_to?(:load_paths)
+        stylesheets = File.expand_path(File.join('..', 'vendor', 'assets', 'stylesheets'))
+        ::Sass.load_paths << stylesheets
+      end
     end
 
     def self.asset_pipeline?

data/lib/rails_admin/bootstrap-sass/sass_functions.rb

@@ -1,5 +1,3 @@
-require 'sass'
-
 module Sass
   module Script
     module Functions
@@ -12,7 +10,7 @@ module Sass
         alphastr = alpha.to_s(16).rjust(2, '0')
         Sass::Script::String.new("##{alphastr}#{color.send(:hex_str)[1..-1]}".upcase)
       end
-      declare :ie_hex_str, [:color]
+      declare :ie_hex_str, [:color] if respond_to?(:declare)
     end
   end
 end

data/lib/rails_admin/config.rb

@@ -59,6 +59,9 @@ module RailsAdmin
       # Set the max width of columns in list view before a new set is created
       attr_accessor :total_columns_width
 
+      # Enable horizontal-scrolling table in list view, ignore total_columns_width
+      attr_accessor :sidescroll
+
       # set parent controller
       attr_accessor :parent_controller
 
@@ -285,6 +288,7 @@ module RailsAdmin
         @excluded_models = []
         @included_models = []
         @total_columns_width = 697
+        @sidescroll = nil
         @label_methods = [:name, :title]
         @main_app_name = proc { [Rails.application.engine_name.titleize.chomp(' Application'), 'Admin'] }
         @registry = {}

data/lib/rails_admin/config/actions/index.rb

@@ -1,3 +1,5 @@
+require 'activemodel-serializers-xml'
+
 module RailsAdmin
   module Config
     module Actions
@@ -76,10 +78,8 @@ module RailsAdmin
                   send_data output,
                             type: "text/csv; charset=#{encoding}; #{'header=present' if header}",
                             disposition: "attachment; filename=#{params[:model_name]}_#{DateTime.now.strftime('%Y-%m-%d_%Hh%Mm%S')}.csv"
-                elsif Rails.version.to_s >= '5'
-                  render plain: output
                 else
-                  render text: output
+                  render plain: output
                 end
               end
             end

data/lib/rails_admin/config/configurable.rb

@@ -30,14 +30,16 @@ module RailsAdmin
         # and allows configurations such as
         # label { "#{label}".upcase }
         # This will use the default definition when called recursively.
-        if instance_variable_get("@#{option_name}_recurring")
+        Thread.current[:rails_admin_recurring] ||= {}
+        Thread.current[:rails_admin_recurring][self] ||= {}
+        if Thread.current[:rails_admin_recurring][self][option_name]
           instance_eval(&default_proc)
         else
-          instance_variable_set("@#{option_name}_recurring", true)
+          Thread.current[:rails_admin_recurring][self][option_name] = true
           instance_eval(&value_proc)
         end
       ensure
-        instance_variable_set("@#{option_name}_recurring", false)
+        Thread.current[:rails_admin_recurring].delete(self)
       end
 
       module ClassMethods

data/lib/rails_admin/config/fields.rb

@@ -84,4 +84,6 @@ require 'rails_admin/config/fields/factories/dragonfly'
 require 'rails_admin/config/fields/factories/carrierwave'
 require 'rails_admin/config/fields/factories/refile'
 require 'rails_admin/config/fields/factories/active_storage'
+require 'rails_admin/config/fields/factories/shrine'
+require 'rails_admin/config/fields/factories/action_text'
 require 'rails_admin/config/fields/factories/association'

data/lib/rails_admin/config/fields/base.rb

@@ -20,7 +20,7 @@ module RailsAdmin
 
         NAMED_INSTANCE_VARIABLES = [
           :@parent, :@root, :@section, :@children_fields_registered,
-          :@associated_model_config, :@group, :@bindings
+          :@associated_model_config, :@group
         ].freeze
 
         def initialize(parent, name, properties)

data/lib/rails_admin/config/fields/factories/action_text.rb

@@ -0,0 +1,12 @@
+require 'rails_admin/config/fields'
+require 'rails_admin/config/fields/types'
+
+RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
+  if defined?(::ActionText) && properties.try(:association?) && (match = /\Arich_text_(.+)\Z/.match properties.name) && properties.klass.to_s == 'ActionText::RichText'
+    field = RailsAdmin::Config::Fields::Types.load(:action_text).new(parent, match[1], properties)
+    fields << field
+    true
+  else
+    false
+  end
+end

data/lib/rails_admin/config/fields/factories/dragonfly.rb

@@ -4,7 +4,7 @@ require 'rails_admin/config/fields/types/file_upload'
 
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
   extensions = [:name, :uid]
-  if (properties.name.to_s =~ /^(.+)_uid$/) && defined?(::Dragonfly) && parent.abstract_model.model.dragonfly_attachment_classes.collect(&:attribute).include?(attachment_name = Regexp.last_match[1].to_sym)
+  if (properties.name.to_s =~ /^(.+)_uid$/) && defined?(::Dragonfly) && parent.abstract_model.model.respond_to?(:dragonfly_attachment_classes) && parent.abstract_model.model.dragonfly_attachment_classes.collect(&:attribute).include?(attachment_name = Regexp.last_match[1].to_sym)
     field = RailsAdmin::Config::Fields::Types.load(:dragonfly).new(parent, attachment_name, properties)
     children_fields = []
     extensions.each do |ext|