rails_admin 0.8.1 → 1.0.0.rc

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

@@ -1 +1 @@
-= form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({value: field.form_value, style: "background-color: #{field.color}", data: {color: true}})
+= form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({class: 'form-control', value: field.form_value, style: "background-color: #{field.color}", data: {color: true}})

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

@@ -3,7 +3,7 @@
     %thead
       %tr
         %th.shrink.model-name= t "admin.table_headers.model_name"
-        %th.shrink.last-used= t "admin.table_headers.last_used"
+        %th.shrink.last-created= t "admin.table_headers.last_created"
         %th.records= t "admin.table_headers.records"
         %th.shrink.controls
     %tbody
@@ -12,13 +12,13 @@
           - index_path = index_path(model_name: abstract_model.to_param)
           - row_class = "#{cycle("odd", "even")}#{" link" if index_path} #{abstract_model.param_key}_links"
           %tr{class: row_class, :"data-link" => index_path}
-            - last_used = @most_recent_changes[abstract_model.model.name]
-            - active = last_used.try(:today?)
+            - last_created = @most_recent_created[abstract_model.model.name]
+            - active = last_created.try(:today?)
             %td
               %span.show= link_to capitalize_first_letter(abstract_model.config.label_plural), index_path, class: 'pjax'
             %td
-              - if last_used
-                = time_ago_in_words last_used
+              - if last_created
+                = time_ago_in_words last_created
                 = t "admin.misc.ago"
             %td
               - count = @count[abstract_model.model.name]

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{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;'}
+          %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{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;'}
+            %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

@@ -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

@@ -106,7 +106,7 @@
     - if @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/config/locales/rails_admin.en.yml

@@ -52,7 +52,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

@@ -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.rb

@@ -9,6 +9,7 @@ require 'rails_admin/extensions/paper_trail'
 require 'rails_admin/extensions/history'
 require 'rails_admin/support/csv_converter'
 require 'rails_admin/support/hash_helper'
+require 'yaml'
 
 module RailsAdmin
   # Setup RailsAdmin
@@ -33,6 +34,28 @@ module RailsAdmin
       RailsAdmin::Config
     end
   end
+
+  # Backwards-compatible with safe_yaml/load when SafeYAML isn't available.
+  # Evaluates available YAML loaders at boot and creates appropriate method,
+  # so no conditionals are required at runtime.
+  begin
+    require 'safe_yaml/load'
+    def self.yaml_load(yaml)
+      SafeYAML.load(yaml)
+    end
+  rescue LoadError
+    if YAML.respond_to?(:safe_load)
+      def self.yaml_load(yaml)
+        YAML.safe_load(yaml)
+      end
+    else
+      raise LoadError.new "Safe-loading of YAML is not available. Please install 'safe_yaml' or install Psych 2.0+"
+    end
+  end
+
+  def self.yaml_dump(object)
+    YAML.dump(object)
+  end
 end
 
 require 'rails_admin/bootstrap-sass' unless defined? Bootstrap

data/lib/rails_admin/adapters/active_record.rb

@@ -67,9 +67,14 @@ module RailsAdmin
       delegate :primary_key, :table_name, to: :model, prefix: false
 
       def encoding
-        encoding = ::ActiveRecord::Base.connection.try(:encoding)
-        encoding ||= ::ActiveRecord::Base.connection.try(:charset) # mysql2
-        encoding || 'UTF-8'
+        case ::ActiveRecord::Base.connection_config[:adapter]
+        when 'postgresql'
+          ::ActiveRecord::Base.connection.select_one("SELECT ''::text AS str;").values.first.encoding
+        when 'mysql2'
+          ::ActiveRecord::Base.connection.instance_variable_get(:@connection).encoding
+        else
+          ::ActiveRecord::Base.connection.select_one("SELECT '' AS str;").values.first.encoding
+        end
       end
 
       def embedded?

data/lib/rails_admin/adapters/mongoid.rb

@@ -3,11 +3,16 @@ require 'rails_admin/config/sections/list'
 require 'rails_admin/adapters/mongoid/abstract_object'
 require 'rails_admin/adapters/mongoid/association'
 require 'rails_admin/adapters/mongoid/property'
+require 'rails_admin/adapters/mongoid/bson'
 
 module RailsAdmin
   module Adapters
     module Mongoid
-      DISABLED_COLUMN_TYPES = ['Range', 'Moped::BSON::Binary', 'BSON::Binary', 'Mongoid::Geospatial::Point']
+      DISABLED_COLUMN_TYPES = %w(Range Moped::BSON::Binary BSON::Binary Mongoid::Geospatial::Point)
+
+      def parse_object_id(value)
+        Bson.parse_object_id(value)
+      end
 
       def new(params = {})
         AbstractObject.new(model.new(params))
@@ -17,10 +22,10 @@ module RailsAdmin
         AbstractObject.new(model.find(id))
       rescue => e
         raise e if %w(
-          BSON::InvalidObjectId
           Mongoid::Errors::DocumentNotFound
           Mongoid::Errors::InvalidFind
           Moped::Errors::InvalidObjectId
+          BSON::InvalidObjectId
         ).exclude?(e.class.to_s)
       end
 
@@ -74,7 +79,7 @@ module RailsAdmin
       end
 
       def encoding
-        'UTF-8'
+        Encoding::UTF_8
       end
 
       def embedded?
@@ -117,11 +122,7 @@ module RailsAdmin
           statements.concat make_condition_for_current_collection(field, conditions_per_collection)
         end
 
-        if statements.any?
-          {'$or' => statements}
-        else
-          {}
-        end
+        statements.any? ? {'$or' => statements} : {}
       end
 
       # filters example => {"string_field"=>{"0055"=>{"o"=>"like", "v"=>"test_value"}}, ...}
@@ -144,11 +145,7 @@ module RailsAdmin
           end
         end
 
-        if statements.any?
-          {'$and' => statements}
-        else
-          {}
-        end
+        statements.any? ? {'$and' => statements} : {}
       end
 
       def parse_collection_name(column)

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

@@ -1,4 +1,5 @@
 require 'rails_admin/adapters/active_record/abstract_object'
+
 module RailsAdmin
   module Adapters
     module Mongoid

data/lib/rails_admin/adapters/mongoid/association.rb

@@ -3,6 +3,7 @@ module RailsAdmin
     module Mongoid
       class Association
         attr_reader :association, :model
+
         def initialize(association, model)
           @association = association
           @model = model

data/lib/rails_admin/adapters/mongoid/bson.rb

@@ -0,0 +1,29 @@
+require 'mongoid'
+
+module RailsAdmin
+  module Adapters
+    module Mongoid
+      class Bson
+        OBJECT_ID = begin
+          if defined?(Moped::BSON)
+            Moped::BSON::ObjectId
+          elsif defined?(BSON::ObjectId)
+            BSON::ObjectId
+          end
+        end
+
+        class << self
+          def parse_object_id(value)
+            OBJECT_ID.from_string(value)
+          rescue => e
+            raise e if %w(
+              Moped::Errors::InvalidObjectId
+              BSON::ObjectId::Invalid
+              BSON::InvalidObjectId
+            ).exclude?(e.class.to_s)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rails_admin/config.rb

@@ -41,6 +41,9 @@ module RailsAdmin
       # been configured
       attr_accessor :default_items_per_page
 
+      # Default association limit
+      attr_accessor :default_associated_collection_limit
+
       attr_reader :default_search_operator
 
       # Configuration option to specify which method names will be searched for
@@ -65,6 +68,9 @@ module RailsAdmin
       # @see RailsAdmin.config
       attr_reader :registry
 
+      # show Gravatar in Navigation bar
+      attr_accessor :show_gravatar
+
       # accepts a hash of static links to be shown below the main navigation
       attr_accessor :navigation_static_links
       attr_accessor :navigation_static_label
@@ -193,7 +199,7 @@ module RailsAdmin
 
       # pool of all found model names from the whole application
       def models_pool
-        excluded = (excluded_models.collect(&:to_s) + ['RailsAdmin::History'])
+        excluded = (excluded_models.collect(&:to_s) + %w(RailsAdmin::History PaperTrail::Version PaperTrail::VersionAssociation))
 
         (viable_models - excluded).uniq.sort
       end
@@ -223,11 +229,9 @@ module RailsAdmin
           end
         end
 
-        if block
-          @registry[key] = RailsAdmin::Config::LazyModel.new(entity, &block)
-        else
-          @registry[key] ||= RailsAdmin::Config::LazyModel.new(entity)
-        end
+        @registry[key] ||= RailsAdmin::Config::LazyModel.new(entity)
+        @registry[key].add_deferred_block(&block) if block
+        @registry[key]
       end
 
       def default_hidden_fields=(fields)
@@ -268,6 +272,7 @@ module RailsAdmin
         @default_hidden_fields[:edit] = [:id, :_id, :created_at, :created_on, :deleted_at, :updated_at, :updated_on, :deleted_on]
         @default_hidden_fields[:show] = [:id, :_id, :created_at, :created_on, :deleted_at, :updated_at, :updated_on, :deleted_on]
         @default_items_per_page = 20
+        @default_associated_collection_limit = 100
         @default_search_operator = 'default'
         @excluded_models = []
         @included_models = []
@@ -275,6 +280,7 @@ module RailsAdmin
         @label_methods = [:name, :title]
         @main_app_name = proc { [Rails.application.engine_name.titleize.chomp(' Application'), 'Admin'] }
         @registry = {}
+        @show_gravatar = true
         @navigation_static_links = {}
         @navigation_static_label = nil
         @parent_controller = '::ApplicationController'

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

@@ -42,8 +42,8 @@ module RailsAdmin
               end
 
               if destroyed.nil?
-                msg = t('admin.flash.error', name: pluralize(0, @model_config.label), action: t('admin.actions.delete.done'))
-                render text: msg, status: :not_found
+                flash[:error] = t('admin.flash.error', name: pluralize(0, @model_config.label), action: t('admin.actions.delete.done'))
+                redirect_to back_or_index
               else
                 flash[:success] = t('admin.flash.successful', name: pluralize(destroyed.count, @model_config.label), action: t('admin.actions.delete.done')) unless destroyed.empty?
                 flash[:error] = t('admin.flash.error', name: pluralize(not_destroyed.count, @model_config.label), action: t('admin.actions.delete.done')) unless not_destroyed.empty?

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

@@ -18,7 +18,7 @@ module RailsAdmin
             if @action.statistics?
               @abstract_models = RailsAdmin::Config.visible_models(controller: self).collect(&:abstract_model)
 
-              @most_recent_changes = {}
+              @most_recent_created = {}
               @count = {}
               @max = 0
               @abstract_models.each do |t|
@@ -26,8 +26,8 @@ module RailsAdmin
                 current_count = t.count({}, scope)
                 @max = current_count > @max ? current_count : @max
                 @count[t.model.name] = current_count
-                next unless t.properties.detect { |c| c.name == :updated_at }
-                @most_recent_changes[t.model.name] = t.first(sort: "#{t.table_name}.updated_at").try(:updated_at)
+                next unless t.properties.detect { |c| c.name == :created_at }
+                @most_recent_created[t.model.name] = t.model.last.try(:created_at)
               end
             end
             render @action.template_name, status: (flash[:error].present? ? :not_found : 200)