rails_admin 0.8.1 → 2.2.1

data/app/controllers/rails_admin/application_controller.rb

@@ -11,9 +11,13 @@ module RailsAdmin
   end
 
   class ApplicationController < Config.parent_controller.constantize
-    before_filter :_authenticate!
-    before_filter :_authorize!
-    before_filter :_audit!
+    include RailsAdmin::Extensions::ControllerExtension
+
+    protect_from_forgery(Config.forgery_protection_settings)
+
+    before_action :_authenticate!
+    before_action :_authorize!
+    before_action :_audit!
 
     helper_method :_current_user, :_get_plugin_name
 
@@ -21,13 +25,13 @@ module RailsAdmin
 
     def get_model
       @model_name = to_model_name(params[:model_name])
-      fail(RailsAdmin::ModelNotFound) unless (@abstract_model = RailsAdmin::AbstractModel.new(@model_name))
-      fail(RailsAdmin::ModelNotFound) if (@model_config = @abstract_model.config).excluded?
+      raise(RailsAdmin::ModelNotFound) unless (@abstract_model = RailsAdmin::AbstractModel.new(@model_name))
+      raise(RailsAdmin::ModelNotFound) if (@model_config = @abstract_model.config).excluded?
       @properties = @abstract_model.properties
     end
 
     def get_object
-      fail(RailsAdmin::ObjectNotFound) unless (@object = @abstract_model.get(params[:id]))
+      raise(RailsAdmin::ObjectNotFound) unless (@object = @abstract_model.get(params[:id]))
     end
 
     def to_model_name(param)
@@ -56,19 +60,21 @@ module RailsAdmin
       instance_eval(&RailsAdmin::Config.audit_with)
     end
 
-    def user_for_paper_trail
-      _current_user.try(:id) || _current_user
+    def rails_admin_controller?
+      true
     end
 
     rescue_from RailsAdmin::ObjectNotFound do
       flash[:error] = I18n.t('admin.flash.object_not_found', model: @model_name, id: params[:id])
       params[:action] = 'index'
+      @status_code = :not_found
       index
     end
 
     rescue_from RailsAdmin::ModelNotFound do
       flash[:error] = I18n.t('admin.flash.model_not_found', model: @model_name)
       params[:action] = 'dashboard'
+      @status_code = :not_found
       dashboard
     end
   end

data/app/controllers/rails_admin/main_controller.rb

@@ -6,9 +6,9 @@ module RailsAdmin
 
     layout :get_layout
 
-    before_filter :get_model, except: RailsAdmin::Config::Actions.all(:root).collect(&:action_name)
-    before_filter :get_object, only: RailsAdmin::Config::Actions.all(:member).collect(&:action_name)
-    before_filter :check_for_cancel
+    before_action :get_model, except: RailsAdmin::Config::Actions.all(:root).collect(&:action_name)
+    before_action :get_object, only: RailsAdmin::Config::Actions.all(:member).collect(&:action_name)
+    before_action :check_for_cancel
 
     RailsAdmin::Config::Actions.all.each do |action|
       class_eval <<-EOS, __FILE__, __LINE__ + 1
@@ -75,7 +75,7 @@ module RailsAdmin
     end
 
     def redirect_to_on_success
-      notice = t('admin.flash.successful', name: @model_config.label, action: t("admin.actions.#{@action.key}.done"))
+      notice = I18n.t('admin.flash.successful', name: @model_config.label, action: I18n.t("admin.actions.#{@action.key}.done"))
       if params[:_add_another]
         redirect_to new_path(return_to: params[:return_to]), flash: {success: notice}
       elsif params[:_add_edit]
@@ -93,7 +93,7 @@ module RailsAdmin
       return unless target_params.present?
       fields = visible_fields(action, model_config)
       allowed_methods = fields.collect(&:allowed_methods).flatten.uniq.collect(&:to_s) << 'id' << '_destroy'
-      fields.each { |field|  field.parse_input(target_params) }
+      fields.each { |field| field.parse_input(target_params) }
       target_params.slice!(*allowed_methods)
       target_params.permit! if target_params.respond_to?(:permit!)
       fields.select(&:nested_form).each do |association|
@@ -105,22 +105,22 @@ module RailsAdmin
     end
 
     def handle_save_error(whereto = :new)
-      flash.now[:error] = t('admin.flash.error', name: @model_config.label, action: t("admin.actions.#{@action.key}.done").html_safe).html_safe
+      flash.now[:error] = I18n.t('admin.flash.error', name: @model_config.label, action: I18n.t("admin.actions.#{@action.key}.done").html_safe).html_safe
       flash.now[:error] += %(<br>- #{@object.errors.full_messages.join('<br>- ')}).html_safe
 
       respond_to do |format|
         format.html { render whereto, status: :not_acceptable }
-        format.js   { render whereto, layout: false, status: :not_acceptable  }
+        format.js   { render whereto, layout: false, status: :not_acceptable }
       end
     end
 
     def check_for_cancel
       return unless params[:_continue] || (params[:bulk_action] && !params[:bulk_ids])
-      redirect_to(back_or_index, notice: t('admin.flash.noaction'))
+      redirect_to(back_or_index, notice: I18n.t('admin.flash.noaction'))
     end
 
     def get_collection(model_config, scope, pagination)
-      associations = model_config.list.fields.select { |f| f.type == :belongs_to_association && !f.polymorphic? }.collect { |f| f.association.name }
+      associations = model_config.list.fields.select { |f| f.try(:eager_load?) }.collect { |f| f.association.name }
       options = {}
       options = options.merge(page: (params[Kaminari.config.param_name] || 1).to_i, per: (params[:per] || model_config.list.items_per_page)) if pagination
       options = options.merge(include: associations) unless associations.blank?

data/app/helpers/rails_admin/application_helper.rb

@@ -35,9 +35,9 @@ module RailsAdmin
       return nil unless _current_user.respond_to?(:email)
       return nil unless abstract_model = RailsAdmin.config(_current_user.class).abstract_model
       return nil unless (edit_action = RailsAdmin::Config::Actions.find(:edit, controller: controller, abstract_model: abstract_model, object: _current_user)).try(:authorized?)
-      link_to url_for(action: edit_action.action_name, model_name: abstract_model.to_param, id: _current_user.id, controller: 'rails_admin/main') do
+      link_to rails_admin.url_for(action: edit_action.action_name, model_name: abstract_model.to_param, id: _current_user.id, controller: 'rails_admin/main') do
         html = []
-        html << image_tag("#{(request.ssl? ? 'https://secure' : 'http://www')}.gravatar.com/avatar/#{Digest::MD5.hexdigest _current_user.email}?s=30", alt: '') if _current_user.email.present?
+        html << image_tag("#{(request.ssl? ? 'https://secure' : 'http://www')}.gravatar.com/avatar/#{Digest::MD5.hexdigest _current_user.email}?s=30", alt: '') if RailsAdmin::Config.show_gravatar && _current_user.email.present?
         html << content_tag(:span, _current_user.email)
         html.join.html_safe
       end
@@ -47,8 +47,8 @@ module RailsAdmin
       if defined?(Devise)
         scope = Devise::Mapping.find_scope!(_current_user)
         main_app.send("destroy_#{scope}_session_path") rescue false
-      else
-        main_app.logout_path if main_app.respond_to?(:logout_path)
+      elsif main_app.respond_to?(:logout_path)
+        main_app.logout_path
       end
     end
 
@@ -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')
@@ -97,7 +112,7 @@ module RailsAdmin
     def navigation(nodes_stack, nodes, level = 0)
       nodes.collect do |node|
         model_param = node.abstract_model.to_param
-        url         = url_for(action: :index, controller: 'rails_admin/main', model_name: model_param)
+        url         = rails_admin.url_for(action: :index, controller: 'rails_admin/main', model_name: model_param)
         level_class = " nav-level-#{level}" if level > 0
         nav_icon = node.navigation_icon ? %(<i class="#{node.navigation_icon}"></i>).html_safe : ''
         li = content_tag :li, data: {model: model_param} do
@@ -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|
@@ -120,7 +135,7 @@ module RailsAdmin
             crumb = begin
               if !current_action?(a, am, o)
                 if a.http_methods.include?(:get)
-                  link_to url_for(action: a.action_name, controller: 'rails_admin/main', model_name: am.try(:to_param), id: (o.try(:persisted?) && o.try(:id) || nil)), class: 'pjax' do
+                  link_to rails_admin.url_for(action: a.action_name, controller: 'rails_admin/main', model_name: am.try(:to_param), id: (o.try(:persisted?) && o.try(:id) || nil)), class: 'pjax' do
                     wording_for(:breadcrumb, a, am, o)
                   end
                 else
@@ -138,12 +153,12 @@ 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)
         %(
           <li title="#{wording if only_icon}" rel="#{'tooltip' if only_icon}" class="icon #{action.key}_#{parent}_link #{'active' if current_action?(action)}">
-            <a class="#{action.pjax? ? 'pjax' : ''}" href="#{url_for(action: action.action_name, controller: 'rails_admin/main', model_name: abstract_model.try(:to_param), id: (object.try(:persisted?) && object.try(:id) || nil))}">
+            <a class="#{action.pjax? ? 'pjax' : ''}" href="#{rails_admin.url_for(action: action.action_name, controller: 'rails_admin/main', model_name: abstract_model.try(:to_param), id: (object.try(:persisted?) && object.try(:id) || nil))}">
               <i class="#{action.link_icon}"></i>
               <span#{only_icon ? " style='display:none'" : ''}>#{wording}</span>
             </a>
@@ -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/form_builder.rb

@@ -1,3 +1,5 @@
+require 'nested_form/builder_mixin'
+
 module RailsAdmin
   class FormBuilder < ::ActionView::Helpers::FormBuilder
     include ::NestedForm::BuilderMixin
@@ -20,10 +22,17 @@ module RailsAdmin
     end
 
     def fieldset_for(fieldset, nested_in)
-      return unless (fields = fieldset.with(form: self, object: @object, view: @template, controller: @template.controller).visible_fields).length > 0
+      fields = fieldset.with(
+        form: self,
+        object: @object,
+        view: @template,
+        controller: @template.controller,
+      ).visible_fields
+      return if fields.empty?
+
       @template.content_tag :fieldset do
         contents = []
-        contents << @template.content_tag(:legend, %(<i class="icon-chevron-#{(fieldset.active? ? 'down' : 'right')}"></i> #{fieldset.label}).html_safe, style: "#{fieldset.name == :default ? 'display:none' : ''}")
+        contents << @template.content_tag(:legend, %(<i class="icon-chevron-#{(fieldset.active? ? 'down' : 'right')}"></i> #{fieldset.label}).html_safe, style: fieldset.name == :default ? 'display:none' : '')
         contents << @template.content_tag(:p, fieldset.help) if fieldset.help.present?
         contents << fields.collect { |field| field_wrapper_for(field, nested_in) }.join
         contents.join.html_safe
@@ -31,16 +40,15 @@ module RailsAdmin
     end
 
     def field_wrapper_for(field, nested_in)
-      if field.label
-        # do not show nested field if the target is the origin
-        unless nested_field_association?(field, nested_in)
-          @template.content_tag(:div, class: "form-group control-group #{field.type_css_class} #{field.css_class} #{'error' if field.errors.present?}", id: "#{dom_id(field)}_field") do
-            label(field.method_name, capitalize_first_letter(field.label), class: 'col-sm-2 control-label') +
-              (field.nested_form ? field_for(field) : input_for(field))
-          end
+      # do not show nested field if the target is the origin
+      return if nested_field_association?(field, nested_in)
+      @template.content_tag(:div, class: "form-group control-group #{field.type_css_class} #{field.css_class} #{'error' if field.errors.present?}", id: "#{dom_id(field)}_field") do
+        if field.label
+          label(field.method_name, capitalize_first_letter(field.label), class: 'col-sm-2 control-label') +
+            (field.nested_form ? field_for(field) : input_for(field))
+        else
+          field.nested_form ? field_for(field) : input_for(field)
         end
-      else
-        field.nested_form ? field_for(field) : input_for(field)
       end
     end
 
@@ -131,7 +139,7 @@ module RailsAdmin
 
     def nested_field_association?(field, nested_in)
       field.inverse_of.presence && nested_in.presence && field.inverse_of == nested_in.name &&
-        (@template.instance_variable_get(:@model_config).abstract_model == field.associated_model_config.abstract_model ||
+        (@template.instance_variable_get(:@model_config).abstract_model == field.abstract_model ||
          field.name == nested_in.inverse_of)
     end
   end

data/app/helpers/rails_admin/main_helper.rb

@@ -43,7 +43,7 @@ module RailsAdmin
     def ordered_filters
       return @ordered_filters if @ordered_filters.present?
       @index = 0
-      @ordered_filters = (params[:f] || @model_config.list.filters).inject({}) do |memo, filter|
+      @ordered_filters = (params[:f].try(:permit!).try(:to_h) || @model_config.list.filters).inject({}) do |memo, filter|
         field_name = filter.is_a?(Array) ? filter.first : filter
         (filter.is_a?(Array) ? filter.last : {(@index += 1) => {'v' => ''}}).each do |index, filter_hash|
           if filter_hash['disabled'].blank?
@@ -56,14 +56,14 @@ 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
         filter_hash = filter_for_field.values.first
         unless (field = filterable_fields.find { |f| f.name == filter_name.to_sym })
-          fail "#{filter_name} is not currently filterable; filterable fields are #{filterable_fields.map(&:name).join(', ')}"
+          raise "#{filter_name} is not currently filterable; filterable fields are #{filterable_fields.map(&:name).join(', ')}"
         end
         case field.type
         when :enum
@@ -76,9 +76,10 @@ module RailsAdmin
         options[:type]  = field.type
         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[:operator] = filter_hash['o'] || field.default_filter_operator
+        options[:required] = field.required
+        options
+      end if ordered_filters
     end
   end
 end

data/app/views/kaminari/ra-twitter-bootstrap/without_count/_next_page.html.haml

@@ -0,0 +1,4 @@
+- if current_page.last?
+  %li.next.disabled= link_to raw(t 'admin.pagination.next'), '#'
+- else
+  %li.next= link_to raw(t 'admin.pagination.next'), url, class: (remote ? 'pjax' : '')

data/app/views/kaminari/ra-twitter-bootstrap/without_count/_paginator.html.haml

@@ -0,0 +1,4 @@
+= paginator.render do
+  %ul.pagination
+    = prev_page_tag if !current_page.first?
+    = next_page_tag

data/app/views/kaminari/ra-twitter-bootstrap/without_count/_prev_page.html.haml

@@ -0,0 +1,4 @@
+- if current_page.first?
+  %li.prev.disabled= link_to raw(t 'admin.pagination.previous'), '#'
+- else
+  %li.prev= link_to raw(t 'admin.pagination.previous'), url, class: (remote ? 'pjax' : '')

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,6 +1,6 @@
 %ul.nav.navbar-nav.navbar-right.root_links
-  - actions(:root).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: "pjax"
+  - 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
   - if _current_user

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,16 +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: "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"
-    -# Initialize JS simple i18n
-    :javascript
-      RailsAdmin.I18n.init('#{I18n.locale}', JSON.parse("#{j I18n.t("admin.js").to_json}"))
+    = render "layouts/rails_admin/head"
   %body.rails_admin
+    #admin-js{:'data-i18n-options' => I18n.t("admin.js").to_json}
     #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"
@@ -19,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/_delete_notice.html.haml

@@ -8,12 +8,17 @@
   - else
     = wording
   %ul
-    - @abstract_model.each_associated_children(object) do |association, child|
-      %li
-        - child_config = RailsAdmin.config(child)
-        = @abstract_model.model.human_attribute_name association.name
-        - wording = child.send(child_config.object_label_method)
-        - if child.id && (show_action = action(:show, child_config.abstract_model, child))
-          = link_to(wording, url_for(action: show_action.action_name, model_name: child_config.abstract_model.to_param, id: child.id), class: 'pjax')
-        - else
-          = wording
+    - @abstract_model.each_associated_children(object) do |association, children|
+      - humanized_association = @abstract_model.model.human_attribute_name association.name
+      - limit = children.count > 12 ? 10 : children.count
+      - children.first(limit).each do |child|
+        = content_tag :li, class: dom_class(child) do
+          - child_config = RailsAdmin.config(child)
+          = humanized_association.singularize
+          - wording = child.send(child_config.object_label_method)
+          - if child.id && (show_action = action(:show, child_config.abstract_model, child))
+            = link_to(wording, url_for(action: show_action.action_name, model_name: child_config.abstract_model.to_param, id: child.id), class: 'pjax')
+          - else
+            = wording
+      - if children.count > limit
+        %li= t('admin.misc.more', count: children.count - limit, models_name: humanized_association)

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_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/_form_enumeration.html.haml

@@ -7,12 +7,13 @@
       sortable: false,
       cacheAll: true,
       regional: {
+        add: t("admin.misc.add_new"),
         chooseAll: t("admin.misc.chose_all"),
-        chosen: t("admin.misc.chosen", name: config.label_plural),
         clearAll: t("admin.misc.clear_all"),
+        down: t("admin.misc.down"),
+        remove: t("admin.misc.remove"),
         search: t("admin.misc.search"),
-        up: t("admin.misc.up"),
-        down: t("admin.misc.down")
+        up: t("admin.misc.up")
       }
     }
   = form.select field.method_name, field.enum, { selected: field.form_value, object: form.object }, field.html_attributes.reverse_merge({data: { filteringmultiselect: true, options: js_data.to_json }, multiple: true})

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

@@ -1,4 +1,7 @@
-- file = form.object.send(field.method_name).presence
+- 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
@@ -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_multiselect.html.haml

@@ -29,12 +29,13 @@
     removable: !!field.removable,
     cacheAll: !!field.associated_collection_cache_all,
     regional: {
-      chooseAll: t("admin.misc.chose_all"),
-      chosen: t("admin.misc.chosen", name: config.label_plural),
-      clearAll: t("admin.misc.clear_all"),
-      search: t("admin.misc.search"),
-      up: t("admin.misc.up"),
-      down: t("admin.misc.down")
+      add: t('admin.misc.add_new'),
+      chooseAll: t('admin.misc.chose_all'),
+      clearAll: t('admin.misc.clear_all'),
+      down: t('admin.misc.down'),
+      remove: t('admin.misc.remove'),
+      search: t('admin.misc.search'),
+      up: t('admin.misc.up')
     }
   }
 

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

@@ -0,0 +1,16 @@
+- field.attachments.each_with_index do |attachment, i|
+  .toggle{class: field.reorderable? ? 'sortables' : ''}
+    = attachment.pretty_value
+    - 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}"
+      - 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 }))
+
+- if field.cache_method
+  = form.hidden_field(field.cache_method)

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/_form_simple_mde.haml

@@ -0,0 +1,8 @@
+:ruby
+  js_data = {
+    js_location: field.js_location,
+    css_location: field.css_location,
+    instance_config: field.instance_config
+  }
+
+= form.text_area field.method_name, field.html_attributes.reverse_merge(data: { richtext: 'simplemde', options: js_data.to_json }).reverse_merge({ value: field.form_value })

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,14 +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
-                = t "admin.misc.ago"
+              - if last_created
+                = 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