obitum-rails_admin 0.0.2 → 0.0.3

data/app/assets/javascripts/rails_admin/ra.filter-box.js

@@ -3,7 +3,15 @@
   var filters;
 
   $.filters = filters = {
-    append: function(field_label, field_name, field_type, field_value, field_operator, field_options, multiple_values, index) {
+    options: {
+      regional: {
+        datePicker: {
+          dateFormat: 'mm/dd/yy'
+        }
+      }
+    },
+
+    append: function(field_label, field_name, field_type, field_value, field_operator, field_options, index) {
       var value_name = 'f[' +  field_name + '][' + index + '][v]';
       var operator_name = 'f[' +  field_name + '][' + index + '][o]';
       switch(field_type) {
@@ -21,22 +29,23 @@
         case 'datetime':
         case 'timestamp':
           var control = '<select class="switch-additionnal-fieldsets input-small" name="' + operator_name + '">' +
-            '<option data-additional-fieldset="false" value="_discard">...</option>' +
-            '<option data-additional-fieldset="false"' + (field_operator == "today"     ? 'selected="selected"' : '') + ' value="today">Today</option>' +
-            '<option data-additional-fieldset="false"' + (field_operator == "yesterday" ? 'selected="selected"' : '') + ' value="yesterday">Yesterday</option>' +
-            '<option data-additional-fieldset="false"' + (field_operator == "this_week" ? 'selected="selected"' : '') + ' value="this_week">This week</option>' +
-            '<option data-additional-fieldset="false"' + (field_operator == "last_week" ? 'selected="selected"' : '') + ' value="last_week">Last week</option>' +
-            '<option data-additional-fieldset="true" ' + (field_operator == "less_than" ? 'selected="selected"' : '') + ' value="less_than">Less than ... days ago</option>' +
-            '<option data-additional-fieldset="true" ' + (field_operator == "more_than" ? 'selected="selected"' : '') + ' value="more_than">More than ... days ago</option>' +
-            '<option data-additional-fieldset="true" ' + (field_operator == "mmddyyyy"  ? 'selected="selected"' : '') + ' value="mmddyyyy">On specific date (mmddyyyy)</option>' +
+            '<option ' + (field_operator == "default"   ? 'selected="selected"' : '') + ' data-additional-fieldset="default" value="default">Date ...</option>' +
+            '<option ' + (field_operator == "between"   ? 'selected="selected"' : '') + ' data-additional-fieldset="between" value="between">Between ... and ...</option>' +
+            '<option ' + (field_operator == "today"   ? 'selected="selected"' : '') + ' value="today">Today</option>' +
+            '<option ' + (field_operator == "yesterday"   ? 'selected="selected"' : '') + ' value="yesterday">Yesterday</option>' +
+            '<option ' + (field_operator == "this_week"   ? 'selected="selected"' : '') + ' value="this_week">This week</option>' +
+            '<option ' + (field_operator == "last_week"   ? 'selected="selected"' : '') + ' value="last_week">Last week</option>' +
             '<option disabled="disabled">---------</option>' +
-            '<option data-additional-fieldset="false"' + (field_operator == "_not_null"  ? 'selected="selected"' : '') + ' value="_not_null">Is present</option>' +
-            '<option data-additional-fieldset="false"' + (field_operator == "_null"    ? 'selected="selected"' : '') + ' value="_null" >Is blank</option>' +
+            '<option ' + (field_operator == "_not_null" ? 'selected="selected"' : '') + ' value="_not_null">Is present</option>' +
+            '<option ' + (field_operator == "_null"     ? 'selected="selected"' : '') + ' value="_null" >Is blank</option>' +
           '</select>'
-          var additional_control = '<input class="additional-fieldset input-small" style="display:' + (field_operator == "less_than" || field_operator == "more_than" || field_operator == "mmddyyyy" ? 'inline-block' : 'none') + ';" type="text" name="' + value_name + '" value="' + field_value + '" /> ';
+          var additional_control = 
+          '<input class="date additional-fieldset default input-small" style="display:' + ((!field_operator || field_operator == "default") ? 'inline-block' : 'none') + ';" type="text" name="' + value_name + '[]" value="' + (field_value[0] || '') + '" /> ' + 
+          '<input placeholder="-∞" class="date additional-fieldset between input-small" style="display:' + ((field_operator == "between") ? 'inline-block' : 'none') + ';" type="text" name="' + value_name + '[]" value="' + (field_value[1] || '') + '" /> ' + 
+          '<input placeholder="∞" class="date additional-fieldset between input-small" style="display:' + ((field_operator == "between") ? 'inline-block' : 'none') + ';" type="text" name="' + value_name + '[]" value="' + (field_value[2] || '') + '" />';
           break;
         case 'enum':
-          var field_options = $('<div/>').html(field_options).text(); // entities decode
+          var multiple_values = ((field_value instanceof Array) ? true : false)
           var control = '<select style="display:' + (multiple_values ? 'none' : 'inline-block') + '" ' + (multiple_values ? '' : 'name="' + value_name + '"') + ' data-name="' + value_name + '" class="select-single input-small">' +
               '<option value="_discard">...</option>' +
               '<option ' + (field_value == "_present" ? 'selected="selected"' : '') + ' value="_present">Is present</option>' +
@@ -53,13 +62,13 @@
         case 'text':
         case 'belongs_to_association':
           var control = '<select class="switch-additionnal-fieldsets input-small" value="' + field_operator + '" name="' + operator_name + '">' +
-            '<option data-additional-fieldset="true"'  + (field_operator == "like"        ? 'selected="selected"' : '') + ' value="like">Contains</option>' +
-            '<option data-additional-fieldset="true"'  + (field_operator == "is"          ? 'selected="selected"' : '') + ' value="is">Is exactly</option>' +
-            '<option data-additional-fieldset="true"'  + (field_operator == "starts_with" ? 'selected="selected"' : '') + ' value="starts_with">Starts with</option>' +
-            '<option data-additional-fieldset="true"'  + (field_operator == "ends_with"   ? 'selected="selected"' : '') + ' value="ends_with">Ends with</option>' +
+            '<option data-additional-fieldset="additional-fieldset"'  + (field_operator == "like"        ? 'selected="selected"' : '') + ' value="like">Contains</option>' +
+            '<option data-additional-fieldset="additional-fieldset"'  + (field_operator == "is"          ? 'selected="selected"' : '') + ' value="is">Is exactly</option>' +
+            '<option data-additional-fieldset="additional-fieldset"'  + (field_operator == "starts_with" ? 'selected="selected"' : '') + ' value="starts_with">Starts with</option>' +
+            '<option data-additional-fieldset="additional-fieldset"'  + (field_operator == "ends_with"   ? 'selected="selected"' : '') + ' value="ends_with">Ends with</option>' +
             '<option disabled="disabled">---------</option>' +
-            '<option data-additional-fieldset="false"' + (field_operator == "_present"    ? 'selected="selected"' : '') + ' value="_present">Is present</option>' +
-            '<option data-additional-fieldset="false"' + (field_operator == "_blank"      ? 'selected="selected"' : '') + ' value="_blank">Is blank</option>' +
+            '<option ' + (field_operator == "_present"    ? 'selected="selected"' : '') + ' value="_present">Is present</option>' +
+            '<option ' + (field_operator == "_blank"      ? 'selected="selected"' : '') + ' value="_blank">Is blank</option>' +
           '</select>'
           var additional_control = '<input class="additional-fieldset input-small" style="display:' + (field_operator == "_blank" || field_operator == "_present" ? 'none' : 'inline-block') + ';" type="text" name="' + value_name + '" value="' + field_value + '" /> ';
           break;
@@ -74,6 +83,7 @@
         (additional_control || '') +
       '</div> ';
       $('#filters_box').append(content);
+      $('#filters_box .date').datepicker(this.options.regional.datePicker);
       $("hr.filters_box:hidden").show('slow');
     }
   }
@@ -87,8 +97,7 @@
       $(this).data('field-value'),
       $(this).data('field-operator'),
       $(this).data('field-options'),
-      $(this).data('field-multiple_values'),
-      $.now().toString().slice(7,11)
+      $.now().toString().slice(6,11)
     );
   });
 
@@ -97,7 +106,6 @@
     form = $(this).parents('form');
     $(this).parents('.filter').remove();
     !$("#filters_box").children().length && $("hr.filters_box:visible").hide('slow');
-    form.submit();
   });
 
   $('#filters_box .switch-select').live('click', function(e) {
@@ -111,8 +119,9 @@
 
   $('#filters_box .switch-additionnal-fieldsets').live('change', function() {
     var selected_option = $(this).find('option:selected');
-    if($(selected_option).data('additional-fieldset')) {
-      $(this).siblings('.additional-fieldset').show('slow');
+    if(klass = $(selected_option).data('additional-fieldset')) {
+      $(this).siblings('.additional-fieldset:not(.' + klass + ')').hide('slow');
+      $(this).siblings('.' + klass).show('slow');
     } else {
       $(this).siblings('.additional-fieldset').hide('slow');
     }

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

@@ -45,7 +45,7 @@ $('.form-horizontal legend').live 'click', ->
     if $(this).has('i.icon-chevron-right').length
       $(this).siblings('.control-group:hidden').show('slow')
       $(this).children('i').toggleClass('icon-chevron-down icon-chevron-right')
-
+      
 $(document).ready ->
 
   $('.animate-width-to').each ->

data/app/assets/stylesheets/rails_admin/aristo/jquery-ui-1.8.7.custom.css.scss

@@ -385,7 +385,7 @@
  * http://docs.jquery.com/UI/Autocomplete#theming
  */
 .ui-autocomplete {
-	position: absolute; cursor: default; z-index: 3;
+	position: absolute; cursor: default; z-index: 1051 !important;
 		-moz-border-radius: 0; 
 		-webkit-border-radius: 0;
 		border-radius: 0;

data/app/assets/stylesheets/rails_admin/base/theming.css.scss

@@ -31,6 +31,11 @@ body.rails_admin {
 
   /* new/edit/export forms */
   .form-horizontal {
+    /* hide hidden fields controls by default */
+    .control-group .hidden_type {
+      display:none;
+    }
+    
     legend {
       cursor:pointer;
       i {

data/app/controllers/rails_admin/main_controller.rb

@@ -69,18 +69,7 @@ module RailsAdmin
       reversed_sort = (field ? field.sort_reverse? : model_config.list.sort_reverse?)
       {:sort => column, :sort_reverse => (params[:sort_reverse] == reversed_sort.to_s)}
     end
-
-    def get_attributes
-      attributes = params[@abstract_model.to_param.gsub('~','_')] || {}
-      attributes.each do |key, value|
-        # Deserialize the attribute if attribute is serialized
-        if @abstract_model.model.serialized_attributes.keys.include?(key) and value.is_a? String
-          attributes[key] = YAML::load(value)
-        end
-      end
-      attributes
-    end
-
+    
     def redirect_to_on_success
       notice = t("admin.flash.successful", :name => @model_config.label, :action => t("admin.actions.#{@action.key}.done"))
       if params[:_add_another]
@@ -92,6 +81,19 @@ module RailsAdmin
       end
     end
 
+    def sanitize_params_for!(action, model_config = @model_config, _params = params[@abstract_model.param_key])
+      return unless _params.present?
+      fields = model_config.send(action).fields
+      fields.select{ |f| f.respond_to?(:parse_input) }.each {|f| f.parse_input(_params) }
+
+      fields.select(&:nested_form).each do |association|
+        children_params = association.multiple? ? _params[association.method_name].try(:values) : [_params[association.method_name]].compact
+        (children_params || []).each do |children_param|
+          sanitize_params_for!(:nested, association.associated_model_config, children_param)
+        end
+      end
+    end
+
     def handle_save_error whereto = :new
       action = params[:action]
 
@@ -129,8 +131,8 @@ module RailsAdmin
       source_model_config = source_abstract_model.config
       source_object = source_abstract_model.get(params[:source_object_id])
       action = params[:current_action].in?(['create', 'update']) ? params[:current_action] : 'edit'
-      association = source_model_config.send(action).fields.find{|f| f.name == params[:associated_collection].to_sym }.with(:controller => self, :object => source_object)
-      association.associated_collection_scope
+      @association = source_model_config.send(action).fields.find{|f| f.name == params[:associated_collection].to_sym }.with(:controller => self, :object => source_object)
+      @association.associated_collection_scope
     end
 
     def associations_hash

data/app/helpers/rails_admin/application_helper.rb

@@ -109,7 +109,7 @@ module RailsAdmin
       return '' if actions.empty?
       content_tag :li, { :class => 'dropdown', :style => 'float:right' } do
         content_tag(:a, { :class => 'dropdown-toggle', :'data-toggle' => "dropdown", :href => '#' }) { t('admin.misc.bulk_menu_title').html_safe + '<b class="caret"></b>'.html_safe } +
-        content_tag(:ul, :class => 'dropdown-menu') do
+        content_tag(:ul, :class => 'dropdown-menu', :style => 'left:auto; right:0;') do
           actions.map do |action|
             content_tag :li do
               link_to_function wording_for(:bulk_link, action), "jQuery('#bulk_action').val('#{action.action_name}'); jQuery('#bulk_form').submit()"

data/app/helpers/rails_admin/form_builder.rb

@@ -32,15 +32,11 @@ module RailsAdmin
     end
 
     def field_wrapper_for field, nested_in
-      if field.is_a?(RailsAdmin::Config::Fields::Types::Hidden)
-        input_for(field)
-      else
-        # do not show nested field if the target is the origin
-        unless field.inverse_of.presence && field.inverse_of == nested_in
-          @template.content_tag(:div, :class => "control-group #{field.type_css_class} #{field.css_class} #{'error' if field.errors.present?}", :id => "#{dom_id(field)}_field") do
-            label(field.method_name, field.label, :class => 'control-label') +
-            (field.nested_form ? field_for(field) : input_for(field))
-          end
+      # do not show nested field if the target is the origin
+      unless field.inverse_of.presence && field.inverse_of == nested_in
+        @template.content_tag(:div, :class => "control-group #{field.type_css_class} #{field.css_class} #{'error' if field.errors.present?}", :id => "#{dom_id(field)}_field") do
+          label(field.method_name, field.label, :class => 'control-label') +
+          (field.nested_form ? field_for(field) : input_for(field))
         end
       end
     end
@@ -62,7 +58,7 @@ module RailsAdmin
     end
 
     def field_for field
-      if field.read_only
+      if field.read_only?
         field.pretty_value.to_s.html_safe
       else
         field.render
@@ -102,7 +98,7 @@ module RailsAdmin
     end
 
     def dom_name field
-      (@dom_name ||= {})[field.name] ||= %{#{@object_name}#{options[:index] && "[#{options[:index]}]"}[#{field.method_name}]#{field.is_a?(Config::Fields::Types::HasManyAssociation) ? '[]' : ''}}
+      (@dom_name ||= {})[field.name] ||= %{#{@object_name}#{options[:index] && "[#{options[:index]}]"}[#{field.method_name}]#{field.is_a?(Config::Fields::Association) && field.multiple? ? '[]' : ''}}
     end
   end
 end

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

@@ -5,7 +5,7 @@
     %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"
+    = stylesheet_link_tag "rails_admin/rails_admin.css", :media => :all
     = javascript_include_tag "rails_admin/rails_admin.js"
   %body.rails_admin
     .navbar.navbar-fixed-top

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

@@ -8,7 +8,7 @@
   else
     selected = form.object.send(field.name)
   end
-  selected_ids = selected.map(&:id)
+  selected_ids = selected.map{|s| s.send(field.associated_primary_key)}
 
 
   current_action = params[:action].in?(['create', 'new']) ? 'create' : 'update'
@@ -18,10 +18,10 @@
   xhr = !field.associated_collection_cache_all
 
   collection = if xhr
-    selected.map { |o| [o.send(config.object_label_method), o.id] }
+    selected.map { |o| [o.send(field.associated_object_label_method), o.send(field.associated_primary_key)] }
   else
     i = 0
-    controller.list_entries(config, :index, field.associated_collection_scope, false).map { |o| [o.send(config.object_label_method), o.id] }.sort_by {|a| [selected_ids.index(a[1]) || selected_ids.size, i+=1] }
+    controller.list_entries(config, :index, field.associated_collection_scope, false).map { |o| [o.send(field.associated_object_label_method), o.send(field.associated_primary_key)] }.sort_by {|a| [selected_ids.index(a[1]) || selected_ids.size, i+=1] }
   end
 
 %input{:name => form.dom_name(field), :type => "hidden", :value => ""}
@@ -40,7 +40,7 @@
       createQuery: function(query) {
         return { query: query }
       },
-      remote_source: "#{index_path(field.associated_model_config.abstract_model, :source_object_id => form.object.id, :source_abstract_model => source_abstract_model.to_param, :associated_collection => field.name, :current_action => current_action, :compact => true).html_safe}",
+      remote_source: "#{index_path(config.abstract_model, :source_object_id => form.object.id, :source_abstract_model => source_abstract_model.to_param, :associated_collection => field.name, :current_action => current_action, :compact => true).html_safe}",
       sortable: #{field.orderable ? 'true' : 'false'},
       cacheAll: #{field.associated_collection_cache_all ? 'true' : 'false'},
       regional: {

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

@@ -5,8 +5,8 @@
 
   if form.object.new_record? && related_id.present? && related_id != 'new'
     selected = config.abstract_model.get(related_id)
-    selected_id = selected.id
-    selected_name = selected.send(config.object_label_method)
+    selected_id = selected.send(field.associated_primary_key)
+    selected_name = selected.send(field.associated_object_label_method)
   else
     selected_id = field.selected_id
     selected_name = field.formatted_value
@@ -17,8 +17,8 @@
   edit_url = authorized?(:edit, config.abstract_model) ? edit_path(:model_name => config.abstract_model.to_param, :modal => true, :id => '__ID__') : ''
 
   xhr = !field.associated_collection_cache_all
-
-  collection = xhr ? [[selected_name, selected_id]] : controller.list_entries(config, :index, field.associated_collection_scope, false).map { |o| [o.send(config.object_label_method), o.id] }
+  
+  collection = xhr ? [[selected_name, selected_id]] : controller.list_entries(config, :index, field.associated_collection_scope, false).map { |o| [o.send(field.associated_object_label_method), o.send(field.associated_primary_key)] }
 
 - selected_id = (hdv = field.html_default_value).nil? ? selected_id : hdv
 = form.select field.method_name, collection, { :selected => selected_id, :include_blank => true }, field.html_attributes.reverse_merge({:placeholder => t('admin.misc.search')})

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

@@ -1,4 +1,4 @@
-= form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge((hdv = field.html_default_value).nil? ? {} : { :value => hdv })
+= form.text_area field.method_name, field.html_attributes.reverse_merge((hdv = field.html_default_value).nil? ? { :value => field.formatted_value } : { :value => hdv })
 
 - if field.ckeditor
   = javascript_tag do

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

@@ -1,4 +1,5 @@
 :ruby
+  require 'rails_admin/config/fields/types/datetime.rb'
   query = params[:query]
   params = request.params.except(:authenticity_token, :action, :controller, :utf8, :bulk_export, :_pjax)
   params.delete(:query) if params[:query].blank?
@@ -38,12 +39,14 @@
     field = @filterable_fields.find{ |field| field.name == filter_name.to_sym }
     field_options = case field.type
     when :enum
-      options_for_select(field.with(:object => @abstract_model.model.new).enum, filter_hash['v']).gsub("\n", '')
+      options_for_select(field.with(:object => @abstract_model.model.new).enum, filter_hash['v'])
     else
       ''
     end
-    "$.filters.append('#{escape_javascript field.label.to_s}', '#{escape_javascript field.name.to_s}', '#{escape_javascript field.type.to_s}', '#{escape_javascript  filter_hash['v'].to_s}', '#{escape_javascript filter_hash['o'].to_s}', '#{escape_javascript field_options.to_s}', #{filter_hash['v'].is_a?(Array)}, '#{escape_javascript filter_index.to_s}');"
-  end.join if @ordered_filters
+    %{
+      $.filters.append(#{field.label.to_json}, #{field.name.to_json}, #{field.type.to_json}, #{filter_hash['v'].to_json}, #{filter_hash['o'].to_json}, #{field_options.to_json}, #{filter_index.to_json});
+    }
+  end.join.html_safe if @ordered_filters
 
 
 = content_for :contextual_tabs do
@@ -53,20 +56,33 @@
       %a.dropdown-toggle{:href => '#', :'data-toggle' => "dropdown"}
         = t('admin.misc.add_filter')
         %b.caret
-      %ul.dropdown-menu#filters
+      %ul.dropdown-menu#filters{:style => 'left:auto; right:0;'}
         - @filterable_fields.each do |field|
           - field_options = case field.type
           - when :enum
-            - h options_for_select(field.with(:object => @abstract_model.model.new).enum).gsub("\n", '')
+            - options_for_select(field.with(:object => @abstract_model.model.new).enum)
           - else
             - ''
           %li
-            %a{:href => '#', "data-field-label" => field.label, "data-field-name" => field.name, "data-field-options" => field_options, "data-field-type" => field.type, "data-field-value" => ""}= field.label
+            %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" => ""}= field.label
 
 #list{:'data-pjax-container' => true}
   %script
     jQuery(function($) {
+    $.filters.options.regional = {
+    datePicker: {
+    dateFormat: #{raw I18n.t("admin.misc.filter_date_format", :default => I18n.t("admin.misc.filter_date_format", :locale => :en)).to_json},
+    dayNames: #{raw RailsAdmin::Config::Fields::Types::Datetime.day_names.to_json},
+    dayNamesShort: #{raw RailsAdmin::Config::Fields::Types::Datetime.abbr_day_names.to_json},
+    dayNamesMin: #{raw RailsAdmin::Config::Fields::Types::Datetime.abbr_day_names.to_json},
+    firstDay: "1",
+    monthNames: #{raw RailsAdmin::Config::Fields::Types::Datetime.month_names.to_json},
+    monthNamesShort: #{raw RailsAdmin::Config::Fields::Types::Datetime.abbr_month_names.to_json},
+    }
+    }
+    
     = @ordered_filter_string
+    
     });
   %style
     - properties.select{ |p| p.column_width.present? }.each do |property|

data/config/locales/fr.yml

@@ -0,0 +1,24 @@
+fr:
+  date:
+    formats:
+      default: "%d/%m/%Y"
+      short: "%e %b"
+      compact: "%d/%m/%y"
+      long: "%e %B %Y"
+    day_names: [dimanche, lundi, mardi, mercredi, jeudi, vendredi, samedi]
+    abbr_day_names: [dim, lun, mar, mer, jeu, ven, sam]
+    month_names: [~, janvier, février, mars, avril, mai, juin, juillet, août, septembre, octobre, novembre, décembre]
+    abbr_month_names: [~, jan., fév., mar., avr., mai, juin, juil., août, sept., oct., nov., déc.]
+    order:
+      - :day
+      - :month
+      - :year
+  time:
+    formats:
+      default: "%d %B %Y %H:%M:%S"
+      short: "%d %b %H:%M"
+      compact: "%d/%m/%y %H:%M"
+      long: "%A %d %B %Y %H:%M"
+      verb: "%d %B %Y"
+    am: 'am'
+    pm: 'pm'

data/config/locales/rails_admin.en.yml

@@ -8,6 +8,7 @@ en:
       truncate: "…"
   admin:
     misc:
+      filter_date_format: "mm/dd/yy" # a combination of 'dd', 'mm' and 'yy' with any delimiter. No other interpolation will be done!
       search: "Search"
       filter: "Filter"
       refresh: "Refresh"

data/lib/rails_admin/adapters/active_record.rb

@@ -5,7 +5,13 @@ module RailsAdmin
   module Adapters
     module ActiveRecord
       DISABLED_COLUMN_TYPES = [:tsvector, :blob, :binary, :spatial]
-      LIKE_OPERATOR =  ::ActiveRecord::Base.configurations[Rails.env]['adapter'] == "postgresql" ? 'ILIKE' : 'LIKE'
+      AR_ADAPTER = ::ActiveRecord::Base.configurations[Rails.env]['adapter']
+      LIKE_OPERATOR = AR_ADAPTER == "postgresql" ? 'ILIKE' : 'LIKE'
+      BEGINNING_OF_DAY = if AR_ADAPTER == "postgresql"
+        lambda { |date| date.beginning_of_day }
+      else
+        lambda { |date| date.yesterday.end_of_day }
+      end
 
       def new(params = {})
         AbstractObject.new(model.new(params))
@@ -46,6 +52,10 @@ module RailsAdmin
       def destroy(objects)
         Array.wrap(objects).each &:destroy
       end
+      
+      def primary_key
+        model.primary_key
+      end
 
       def associations
         model.reflect_on_all_associations.map do |association|
@@ -53,10 +63,9 @@ module RailsAdmin
             :name => association.name.to_sym,
             :pretty_name => association.name.to_s.tr('_', ' ').capitalize,
             :type => association.macro,
-            :parent_model_proc => Proc.new { association_parent_model_lookup(association) },
-            :parent_key => association_parent_key_lookup(association),
-            :child_model_proc => Proc.new { association_child_model_lookup(association) },
-            :child_key => association_child_key_lookup(association),
+            :model_proc => Proc.new { association_model_lookup(association) },
+            :primary_key_proc => Proc.new { association_primary_key_lookup(association) },
+            :foreign_key => association_foreign_key_lookup(association),
             :foreign_type => association_foreign_type_lookup(association),
             :as => association_as_lookup(association),
             :polymorphic => association_polymorphic_lookup(association),
@@ -162,27 +171,35 @@ module RailsAdmin
           end
           ["(#{column} #{LIKE_OPERATOR} ?)", value]
         when :datetime, :timestamp, :date
-          return unless operator != 'default'
-          values = case operator
+          date_format = I18n.t("admin.misc.filter_date_format", :default => I18n.t("admin.misc.filter_date_format", :locale => :en)).gsub('dd', '%d').gsub('mm', '%m').gsub('yy', '%Y')
+          case operator 
+          when 'between'
+            start_date = value[1].present? ? (Date.strptime(value[1], date_format).instance_eval(&BEGINNING_OF_DAY) rescue false) : false
+            end_date   = value[2].present? ? (Date.strptime(value[2], date_format).end_of_day rescue false) : false
           when 'today'
-            [Date.today.beginning_of_day, Date.today.end_of_day]
+            start_date = Date.today.instance_eval(&BEGINNING_OF_DAY)
+            end_date   = Date.today.end_of_day
           when 'yesterday'
-            [Date.yesterday.beginning_of_day, Date.yesterday.end_of_day]
+            start_date = Date.yesterday.instance_eval(&BEGINNING_OF_DAY)
+            end_date   = Date.yesterday.end_of_day
           when 'this_week'
-            [Date.today.beginning_of_week.beginning_of_day, Date.today.end_of_week.end_of_day]
+            start_date = Date.today.beginning_of_week.instance_eval(&BEGINNING_OF_DAY)
+            end_date   = Date.today.end_of_week.end_of_day
           when 'last_week'
-            [1.week.ago.to_date.beginning_of_week.beginning_of_day, 1.week.ago.to_date.end_of_week.end_of_day]
-          when 'less_than'
-            return if value.blank?
-            [value.to_i.days.ago, DateTime.now]
-          when 'more_than'
-            return if value.blank?
-            [2000.years.ago, value.to_i.days.ago]
-          when 'mmddyyyy'
-            return if (value.blank? || value.match(/([0-9]{8})/).nil?)
-            [Date.strptime(value.match(/([0-9]{8})/)[1], '%m%d%Y').beginning_of_day, Date.strptime(value.match(/([0-9]{8})/)[1], '%m%d%Y').end_of_day]
+            start_date = 1.week.ago.to_date.beginning_of_week.instance_eval(&BEGINNING_OF_DAY)
+            end_date   = 1.week.ago.to_date.end_of_week.end_of_day
+          else # default
+            start_date = (Date.strptime(Array.wrap(value).first, date_format).instance_eval(&BEGINNING_OF_DAY) rescue false)
+            end_date   = (Date.strptime(Array.wrap(value).first, date_format).end_of_day rescue false)
+          end
+          
+          if start_date && end_date
+            ["(#{column} BETWEEN ? AND ?)", start_date, end_date]
+          elsif start_date
+            ["(#{column} >= ?)", start_date]
+          elsif end_date
+            ["(#{column} <= ?)", end_date]
           end
-          ["(#{column} BETWEEN ? AND ?)", *values]
         when :enum
           return if value.blank?
           ["(#{column} IN (?))", Array.wrap(value)]
@@ -202,18 +219,11 @@ module RailsAdmin
         @@polymorphic_parents[name.to_sym]
       end
 
-      def association_parent_model_lookup(association)
-        case association.macro
-        when :belongs_to
-          if association.options[:polymorphic]
-            RailsAdmin::Adapters::ActiveRecord.polymorphic_parents(association.name) || []
-          else
-            association.klass
-          end
-        when :has_one, :has_many, :has_and_belongs_to_many
-          association.active_record
+      def association_model_lookup(association)
+        if association.options[:polymorphic]
+          RailsAdmin::Adapters::ActiveRecord.polymorphic_parents(association.name) || []
         else
-          raise "Unknown association type: #{association.macro.inspect}"
+          association.klass
         end
       end
 
@@ -235,8 +245,8 @@ module RailsAdmin
         association.options[:polymorphic]
       end
 
-      def association_parent_key_lookup(association)
-        [:id]
+      def association_primary_key_lookup(association)
+        association.options[:primary_key] || association.klass.primary_key
       end
 
       def association_inverse_of_lookup(association)
@@ -247,18 +257,7 @@ module RailsAdmin
         association.options[:readonly]
       end
 
-      def association_child_model_lookup(association)
-        case association.macro
-        when :belongs_to
-          association.active_record
-        when :has_one, :has_many, :has_and_belongs_to_many
-          association.klass
-        else
-          raise "Unknown association type: #{association.macro.inspect}"
-        end
-      end
-
-      def association_child_key_lookup(association)
+      def association_foreign_key_lookup(association)
         association.foreign_key.to_sym
       end
     end

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

@@ -25,12 +25,16 @@ module RailsAdmin
             elsif request.put? # UPDATE
 
               @cached_assocations_hash = associations_hash
-              @attributes = get_attributes
               @modified_assoc = []
 
               @old_object = @object.dup
-              @model_config.update.fields.map { |f| f.parse_input(@attributes) if f.respond_to?(:parse_input) }
-              @object.set_attributes(@attributes, _attr_accessible_role)
+              
+              sanitize_params_for! :update
+              
+              @object.set_attributes(params[@abstract_model.param_key], _attr_accessible_role)
+              @authorization_adapter && @authorization_adapter.attributes_for(:update, @abstract_model).each do |name, value|
+                @object.send("#{name}=", value)
+              end
 
               if @object.save
                 @auditing_adapter && @auditing_adapter.update_object(@abstract_model, @object, @cached_assocations_hash, associations_hash, @modified_assoc, @old_object, _current_user)

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

@@ -37,7 +37,9 @@ module RailsAdmin
 
               format.json do
                 output = if params[:compact]
-                  @objects.map{ |o| { :id => o.id, :label => o.send(@model_config.object_label_method) } }
+                  primary_key_method = @association ? @association.associated_primary_key : @model_config.abstract_model.primary_key
+                  label_method = @model_config.object_label_method
+                  @objects.map{ |o| { :id => o.send(primary_key_method), :label => o.send(label_method) } }
                 else
                   @objects.to_json(@schema)
                 end

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

@@ -34,13 +34,13 @@ module RailsAdmin
 
               @modified_assoc = []
               @object = @abstract_model.new
-              @attributes = get_attributes
-              @model_config.create.fields.each {|f| f.parse_input(@attributes) if f.respond_to?(:parse_input) }
+              sanitize_params_for! :create
+              
+              @object.set_attributes(params[@abstract_model.param_key], _attr_accessible_role)
               @authorization_adapter && @authorization_adapter.attributes_for(:create, @abstract_model).each do |name, value|
                 @object.send("#{name}=", value)
               end
-              @object.set_attributes(@attributes, _attr_accessible_role)
-
+              
               if @object.save
                 @auditing_adapter && @auditing_adapter.create_object("Created #{@model_config.with(:object => @object).object_label}", @object, @abstract_model, _current_user)
                 respond_to do |format|

data/lib/rails_admin/config/actions.rb

@@ -28,7 +28,7 @@ module RailsAdmin
 
         def find custom_key, bindings = {}
           init_actions!
-          action = @@actions.find{ |a| a.custom_key == custom_key }.with(bindings)
+          action = @@actions.find{ |a| a.custom_key == custom_key }.try(:with, bindings)
           bindings[:controller] ? (action.try(:visible?) && action || nil) : action
         end