rails_admin 1.4.2 → 3.1.2

data/lib/rails_admin/adapters/mongoid.rb

@@ -1,32 +1,37 @@
+# frozen_string_literal: true
+
 require 'mongoid'
 require 'rails_admin/config/sections/list'
-require 'rails_admin/adapters/mongoid/abstract_object'
 require 'rails_admin/adapters/mongoid/association'
+require 'rails_admin/adapters/mongoid/object_extension'
 require 'rails_admin/adapters/mongoid/property'
 require 'rails_admin/adapters/mongoid/bson'
 
 module RailsAdmin
   module Adapters
     module Mongoid
-      DISABLED_COLUMN_TYPES = %w(Range Moped::BSON::Binary BSON::Binary Mongoid::Geospatial::Point).freeze
+      DISABLED_COLUMN_TYPES = %w[Range Moped::BSON::Binary BSON::Binary Mongoid::Geospatial::Point].freeze
 
       def parse_object_id(value)
         Bson.parse_object_id(value)
       end
 
       def new(params = {})
-        AbstractObject.new(model.new(params))
+        model.new(params).extend(ObjectExtension)
       end
 
-      def get(id)
-        AbstractObject.new(model.find(id))
-      rescue => e
-        raise e if %w(
+      def get(id, scope = scoped)
+        object = scope.find(id)
+        return nil unless object
+
+        object.extend(ObjectExtension)
+      rescue StandardError => e
+        raise e if %w[
           Mongoid::Errors::DocumentNotFound
           Mongoid::Errors::InvalidFind
           Moped::Errors::InvalidObjectId
           BSON::InvalidObjectId
-        ).exclude?(e.class.to_s)
+        ].exclude?(e.class.to_s)
       end
 
       def scoped
@@ -42,13 +47,19 @@ 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]
-        if options[:page] && options[:per]
-          scope = scope.send(Kaminari.config.page_method_name, options[:page]).per(options[:per])
-        end
+        scope = query_scope(scope, options[:query]) if options[:query]
+        scope = filter_scope(scope, options[:filters]) if options[:filters]
+        scope = scope.send(Kaminari.config.page_method_name, options[:page]).per(options[:per]) if options[:page] && options[:per]
         scope = sort_by(options, scope) if options[:sort]
         scope
+      rescue NoMethodError => e
+        if /page/.match?(e.message)
+          e = e.exception <<~ERROR
+            #{e.message}
+            If you don't have kaminari-mongoid installed, add `gem 'kaminari-mongoid'` to your Gemfile.
+          ERROR
+        end
+        raise e
       end
 
       def count(options = {}, scope = nil)
@@ -74,6 +85,12 @@ module RailsAdmin
         fields.collect { |_name, field| Property.new(field, model) }
       end
 
+      def base_class
+        klass = model
+        klass = klass.superclass while klass.hereditary?
+        klass
+      end
+
       def table_name
         model.collection_name.to_s
       end
@@ -104,36 +121,41 @@ 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] ||= []
           conditions_per_collection[collection_name] << statement
         end
         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|
           filters_dump.each do |_, filter_dump|
             field = fields.detect { |f| f.name.to_s == field_name }
             next unless field
+
             value = parse_field_value(field, filter_dump[:v])
             conditions_per_collection = make_field_conditions(field, value, (filter_dump[:o] || 'default'))
             field_statements = make_condition_for_current_collection(field, conditions_per_collection)
@@ -145,7 +167,7 @@ module RailsAdmin
           end
         end
 
-        statements.any? ? {'$and' => statements} : {}
+        scope.where(statements.any? ? {'$and' => statements} : {})
       end
 
       def parse_collection_name(column)
@@ -174,11 +196,12 @@ module RailsAdmin
       def perform_search_on_associated_collection(field_name, conditions)
         target_association = associations.detect { |a| a.name == field_name }
         return [] unless target_association
+
         model = target_association.klass
         case target_association.type
         when :belongs_to, :has_and_belongs_to_many
           [{target_association.foreign_key.to_s => {'$in' => model.where('$or' => conditions).all.collect { |r| r.send(target_association.primary_key) }}}]
-        when :has_many
+        when :has_many, :has_one
           [{target_association.primary_key.to_s => {'$in' => model.where('$or' => conditions).all.collect { |r| r.send(target_association.foreign_key) }}}]
         end
       end
@@ -189,9 +212,7 @@ module RailsAdmin
         case options[:sort]
         when String
           field_name, collection_name = options[:sort].split('.').reverse
-          if collection_name && collection_name != table_name
-            raise('sorting by associated model column is not supported in Non-Relational databases')
-          end
+          raise 'sorting by associated model column is not supported in Non-Relational databases' if collection_name && collection_name != table_name
         when Symbol
           field_name = options[:sort].to_s
         end
@@ -229,8 +250,8 @@ module RailsAdmin
         end
 
         def build_statement_for_boolean
-          return {@column => false} if %w(false f 0).include?(@value)
-          return {@column => true} if %w(true t 1).include?(@value)
+          return {@column => false} if %w[false f 0].include?(@value)
+          return {@column => true} if %w[true t 1].include?(@value)
         end
 
         def column_for_value(value)
@@ -239,8 +260,11 @@ module RailsAdmin
 
         def build_statement_for_string_or_text
           return if @value.blank?
-          @value = begin
+
+          @value =
             case @operator
+            when 'not_like'
+              Regexp.compile("^((?!#{Regexp.escape(@value)}).)*$", Regexp::IGNORECASE)
             when 'default', 'like'
               Regexp.compile(Regexp.escape(@value), Regexp::IGNORECASE)
             when 'starts_with'
@@ -252,12 +276,13 @@ module RailsAdmin
             else
               return
             end
-          end
+
           {@column => @value}
         end
 
         def build_statement_for_enum
           return if @value.blank?
+
           {@column => {'$in' => Array.wrap(@value)}}
         end
 
@@ -266,7 +291,9 @@ module RailsAdmin
         end
 
         def range_filter(min, max)
-          if min && max
+          if min && max && min == max
+            {@column => min}
+          elsif min && max
             {@column => {'$gte' => min, '$lte' => max}}
           elsif min
             {@column => {'$gte' => min}}

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_admin/config/proxyable'
 require 'rails_admin/config/configurable'
 require 'rails_admin/config/hideable'
@@ -18,9 +20,25 @@ module RailsAdmin
           []
         end
 
+        register_instance_option :show_in_navigation do
+          root?
+        end
+
+        register_instance_option :show_in_sidebar do
+          !show_in_navigation
+        end
+
+        register_instance_option :show_in_menu do
+          true
+        end
+
+        register_instance_option :sidebar_label do
+          nil
+        end
+
         # http://getbootstrap.com/2.3.2/base-css.html#icons
         register_instance_option :link_icon do
-          'icon-question-sign'
+          'fas fa-question'
         end
 
         # Should the action be visible
@@ -33,7 +51,7 @@ module RailsAdmin
             (only.nil? || [only].flatten.collect(&:to_s).include?(bindings[:abstract_model].to_s)) &&
             ![except].flatten.collect(&:to_s).include?(bindings[:abstract_model].to_s) &&
             !bindings[:abstract_model].config.excluded?
-          )
+          ) && (!respond_to?(:writable?) || writable?)
         end
 
         register_instance_option :authorized? do
@@ -57,8 +75,13 @@ module RailsAdmin
           false
         end
 
-        # Render via pjax?
-        register_instance_option :pjax? do
+        # Target window [_self, _blank]
+        register_instance_option :link_target do
+          nil
+        end
+
+        # Determines whether to navigate via Turbo Drive or not
+        register_instance_option :turbo? do
           true
         end
 
@@ -83,7 +106,7 @@ module RailsAdmin
           key.to_sym
         end
 
-        # For Cancan and the like
+        # For CanCanCan and the like
         register_instance_option :authorization_key do
           key.to_sym
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     module Actions
@@ -9,7 +11,7 @@ module RailsAdmin
         end
 
         register_instance_option :http_methods do
-          [:post, :delete]
+          %i[post delete]
         end
 
         register_instance_option :controller do
@@ -36,7 +38,7 @@ module RailsAdmin
                   destroyed = processed_objects.select(&:destroyed?)
                   not_destroyed = processed_objects - destroyed
                   destroyed.each do |object|
-                    @auditing_adapter && @auditing_adapter.delete_object(object, @abstract_model, _current_user)
+                    @auditing_adapter&.delete_object(object, @abstract_model, _current_user)
                   end
                 end
               end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     module Actions
@@ -18,20 +20,21 @@ module RailsAdmin
 
         register_instance_option :controller do
           proc do
-            @history = @auditing_adapter && @auditing_adapter.latest(@action.auditing_versions_limit) || []
+            @history = @auditing_adapter&.latest(@action.auditing_versions_limit) if @action.history?
             if @action.statistics?
-              @abstract_models = RailsAdmin::Config.visible_models(controller: self).collect(&:abstract_model)
+              model_configs = RailsAdmin::Config.visible_models(controller: self)
 
+              @abstract_models = model_configs.map(&:abstract_model)
               @most_recent_created = {}
               @count = {}
               @max = 0
-              @abstract_models.each do |t|
-                scope = @authorization_adapter && @authorization_adapter.query(:index, t)
-                current_count = t.count({}, scope)
+              model_configs.each do |config|
+                scope = @authorization_adapter&.query(:index, config.abstract_model)
+                current_count = config.abstract_model.count({}, scope)
                 @max = current_count > @max ? current_count : @max
-                @count[t.model.name] = current_count
-                next unless t.properties.detect { |c| c.name == :created_at }
-                @most_recent_created[t.model.name] = t.model.last.try(:created_at)
+                name = config.abstract_model.model.name
+                @count[name] = current_count
+                @most_recent_created[name] = config.last_created_at
               end
             end
             render @action.template_name, status: @status_code || :ok
@@ -43,12 +46,16 @@ module RailsAdmin
         end
 
         register_instance_option :link_icon do
-          'icon-home'
+          'fas fa-home'
         end
 
         register_instance_option :statistics? do
           true
         end
+
+        register_instance_option :history? do
+          true
+        end
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     module Actions
@@ -13,7 +15,7 @@ module RailsAdmin
         end
 
         register_instance_option :http_methods do
-          [:get, :delete]
+          %i[get delete]
         end
 
         register_instance_option :authorization_key do
@@ -31,24 +33,24 @@ module RailsAdmin
 
             elsif request.delete? # DESTROY
 
-              redirect_path = nil
-              @auditing_adapter && @auditing_adapter.delete_object(@object, @abstract_model, _current_user)
+              @auditing_adapter&.delete_object(@object, @abstract_model, _current_user)
               if @object.destroy
                 flash[:success] = t('admin.flash.successful', name: @model_config.label, action: t('admin.actions.delete.done'))
-                redirect_path = index_path
+                redirect_to index_path
               else
-                flash[:error] = t('admin.flash.error', name: @model_config.label, action: t('admin.actions.delete.done'))
-                redirect_path = back_or_index
+                handle_save_error :delete
               end
 
-              redirect_to redirect_path
-
             end
           end
         end
 
         register_instance_option :link_icon do
-          'icon-remove'
+          'fas fa-times'
+        end
+
+        register_instance_option :writable? do
+          !(bindings[:object] && bindings[:object].readonly?)
         end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     module Actions
@@ -9,7 +11,7 @@ module RailsAdmin
         end
 
         register_instance_option :http_methods do
-          [:get, :put]
+          %i[get put]
         end
 
         register_instance_option :controller do
@@ -18,22 +20,20 @@ module RailsAdmin
 
               respond_to do |format|
                 format.html { render @action.template_name }
-                format.js   { render @action.template_name, layout: false }
+                format.js   { render @action.template_name, layout: 'rails_admin/modal', content_type: Mime[:html].to_s }
               end
 
             elsif request.put? # UPDATE
               sanitize_params_for!(request.xhr? ? :modal : :update)
 
-              @object.set_attributes(params[@abstract_model.param_key])
-              @authorization_adapter && @authorization_adapter.attributes_for(:update, @abstract_model).each do |name, value|
-                @object.send("#{name}=", value)
-              end
+              @object.assign_attributes(params[@abstract_model.param_key])
+              @authorization_adapter&.authorize(:update, @abstract_model, @object)
               changes = @object.changes
               if @object.save
-                @auditing_adapter && @auditing_adapter.update_object(@object, @abstract_model, _current_user, changes)
+                @auditing_adapter&.update_object(@object, @abstract_model, _current_user, changes)
                 respond_to do |format|
                   format.html { redirect_to_on_success }
-                  format.js { render json: {id: @object.id.to_s, label: @model_config.with(object: @object).object_label} }
+                  format.json { render json: {id: @object.id.to_s, label: @model_config.with(object: @object).object_label} }
                 end
               else
                 handle_save_error :edit
@@ -44,7 +44,11 @@ module RailsAdmin
         end
 
         register_instance_option :link_icon do
-          'icon-pencil'
+          'fas fa-pencil-alt'
+        end
+
+        register_instance_option :writable? do
+          !(bindings[:object] && bindings[:object].readonly?)
         end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     module Actions
@@ -9,12 +11,13 @@ module RailsAdmin
         end
 
         register_instance_option :http_methods do
-          [:get, :post]
+          %i[get post]
         end
 
         register_instance_option :controller do
           proc do
-            if format = params[:json] && :json || params[:csv] && :csv || params[:xml] && :xml
+            format = params[:json] && :json || params[:csv] && :csv || params[:xml] && :xml
+            if format
               request.format = format
               @schema = HashHelper.symbolize(params[:schema].slice(:except, :include, :methods, :only).permit!.to_h) if params[:schema] # to_json and to_xml expect symbols for keys AND values.
               @objects = list_entries(@model_config, :export)
@@ -30,7 +33,7 @@ module RailsAdmin
         end
 
         register_instance_option :link_icon do
-          'icon-share'
+          'fas fa-file-export'
         end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     module Actions
@@ -19,7 +21,7 @@ module RailsAdmin
         register_instance_option :controller do
           proc do
             @general = true
-            @history = @auditing_adapter && @auditing_adapter.listing_for_model(@abstract_model, params[:query], params[:sort], params[:sort_reverse], params[:all], params[:page]) || []
+            @history = @auditing_adapter&.listing_for_model(@abstract_model, params[:query], params[:sort], params[:sort_reverse], params[:all], params[Kaminari.config.param_name]) || []
 
             render @action.template_name
           end
@@ -30,7 +32,7 @@ module RailsAdmin
         end
 
         register_instance_option :link_icon do
-          'icon-book'
+          'fas fa-book'
         end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RailsAdmin
   module Config
     module Actions
@@ -19,7 +21,7 @@ module RailsAdmin
         register_instance_option :controller do
           proc do
             @general = false
-            @history = @auditing_adapter && @auditing_adapter.listing_for_object(@abstract_model, @object, params[:query], params[:sort], params[:sort_reverse], params[:all], params[:page]) || []
+            @history = @auditing_adapter&.listing_for_object(@abstract_model, @object, params[:query], params[:sort], params[:sort_reverse], params[:all], params[Kaminari.config.param_name]) || []
 
             render @action.template_name
           end
@@ -30,7 +32,7 @@ module RailsAdmin
         end
 
         register_instance_option :link_icon do
-          'icon-book'
+          'fas fa-book'
         end
       end
     end

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

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require 'activemodel-serializers-xml'
+
 module RailsAdmin
   module Config
     module Actions
@@ -9,7 +13,7 @@ module RailsAdmin
         end
 
         register_instance_option :http_methods do
-          [:get, :post]
+          %i[get post]
         end
 
         register_instance_option :route_fragment do
@@ -18,7 +22,8 @@ module RailsAdmin
 
         register_instance_option :breadcrumb_parent do
           parent_model = bindings[:abstract_model].try(:config).try(:parent)
-          if am = parent_model && RailsAdmin.config(parent_model).try(:abstract_model)
+          am = parent_model && RailsAdmin.config(parent_model).try(:abstract_model)
+          if am
             [:index, am]
           else
             [:dashboard]
@@ -31,9 +36,7 @@ module RailsAdmin
 
             unless @model_config.list.scopes.empty?
               if params[:scope].blank?
-                unless @model_config.list.scopes.first.nil?
-                  @objects = @objects.send(@model_config.list.scopes.first)
-                end
+                @objects = @objects.send(@model_config.list.scopes.first) unless @model_config.list.scopes.first.nil?
               elsif @model_config.list.scopes.collect(&:to_s).include?(params[:scope])
                 @objects = @objects.send(params[:scope].to_sym)
               end
@@ -45,7 +48,7 @@ module RailsAdmin
               end
 
               format.json do
-                output = begin
+                output =
                   if params[:compact]
                     primary_key_method = @association ? @association.associated_primary_key : @model_config.abstract_model.primary_key
                     label_method = @model_config.object_label_method
@@ -53,7 +56,7 @@ module RailsAdmin
                   else
                     @objects.to_json(@schema)
                   end
-                end
+
                 if params[:send_data]
                   send_data output, filename: "#{params[:model_name]}_#{DateTime.now.strftime('%Y-%m-%d_%Hh%Mm%S')}.json"
                 else
@@ -76,10 +79,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
@@ -87,7 +88,7 @@ module RailsAdmin
         end
 
         register_instance_option :link_icon do
-          'icon-th-list'
+          'fas fa-th-list'
         end
       end
     end