active_scaffold_vho 3.0.26 → 3.0.27

data/frontends/default/javascripts/jquery/active_scaffold.js

@@ -119,7 +119,7 @@ $(document).ready(function() {
   });
   $('a.as_cancel').live('ajax:beforeSend', function(event, xhr, settings) {
     var as_cancel = $(this);
-    var action_link = ActiveScaffold.ActionLink.get($(this));
+    var action_link = ActiveScaffold.find_action_link(as_cancel);
     var refresh_data = as_cancel.attr('data-refresh');
 
     if (action_link && action_link.position && refresh_data === 'true' && action_link.refresh_url) {
@@ -159,19 +159,27 @@ $(document).ready(function() {
     ActiveScaffold.report_500_response(as_scaffold);
     return true;
   });
-  $('a.as_paginate').live('ajax:before',function(event) {
+  $('div.active-scaffold-footer .pagination a').live('ajax:before',function(event) {
     var as_paginate = $(this);
+    var loading_indicator = as_paginate.closest('.pagination').find('img.loading-indicator').first();
     var history_controller_id = as_paginate.attr('data-page-history');
     if (history_controller_id) addActiveScaffoldPageToHistory(as_paginate.attr('href'), history_controller_id);
-    as_paginate.prevAll('img.loading-indicator').css('visibility','visible');
+
+    if (loading_indicator == null || loading_indicator.length == 0) {
+      var table_loading_indicator = as_paginate.closest('div.active-scaffold').find('div.actions img.loading-indicator').first();
+      loading_indicator = table_loading_indicator.clone();
+      loading_indicator.attr('id', null);
+      as_paginate.closest('.pagination').prepend(loading_indicator);
+    }
+    loading_indicator.css('visibility','visible');
     return true;
   });
-  $('a.as_paginate').live('ajax:failure', function(event) {
+  $('div.active-scaffold-footer .pagination a').live('ajax:failure', function(event) {
     var as_scaffold = $(this).closest('.active-scaffold');
     ActiveScaffold.report_500_response(as_scaffold);
     return true;
   });
-  $('a.as_paginate').live('ajax:complete', function(event) {
+  $('div.active-scaffold-footer .pagination a').live('ajax:complete', function(event) {
     $(this).prevAll('img.loading-indicator').css('visibility','hidden');
     return true;
   });
@@ -661,7 +669,7 @@ var ActiveScaffold = {
   },
 
   report_500_response: function(active_scaffold_id) {
-    server_error = $(active_scaffold_id).find('td.messages-container p.server-error');
+    server_error = $(active_scaffold_id).find('td.messages-container p.server-error').filter(":first");
     if (!$(server_error).is(':visible')) {
       server_error.show();
     }
@@ -1099,7 +1107,7 @@ ActiveScaffold.ActionLink.Abstract = Class.extend({
     this.adapter.addClass('as_adapter');
     this.adapter.data('action_link', this);
   },
-  wrap_with_adapter_html: function(content) {
+  wrap_with_adapter_html: function(content, should_refresh_data) {
     // players_view class missing
     var id_string = null;
     var close_label = this.scaffold().attr('data-closelabel');
@@ -1115,7 +1123,7 @@ ActiveScaffold.ActionLink.Abstract = Class.extend({
         id_string = this.target.attr('id').replace('list', 'nested');
     }
 
-    return '<tr class="inline-adapter" id="' + id_string + '"><td colspan="99" class="inline-adapter-cell"><div class="' + this.action + '-view ' + controller +  '-view view"><a class="inline-adapter-close as_cancel" title="' + close_label + '" data-remote="true" data-refresh="false" href="">' + close_label +'</a>' + content + '</div></td></tr>'
+    return '<tr class="inline-adapter" id="' + id_string + '"><td colspan="99" class="inline-adapter-cell"><div class="' + this.action + '-view ' + controller +  '-view view"><a class="inline-adapter-close as_cancel" title="' + close_label + '" data-remote="true" data-refresh="' + should_refresh_data + '" href="">' + close_label +'</a>' + content + '</div></td></tr>'
   }
 });
 
@@ -1153,6 +1161,7 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
   },
 
   insert: function(content) {
+    var should_refresh_data = (typeof(this.refresh_ur)== 'undefined');
     this.close_previous_adapter();
 
     if (this.position == 'replace') {
@@ -1161,12 +1170,12 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
     }
 
     if (this.position == 'after') {
-      this.target.after(this.wrap_with_adapter_html(content));
+      this.target.after(this.wrap_with_adapter_html(content, should_refresh_data));
       ActiveScaffold.trigger_load_events(this.target.next().find('[data-as_load]'));
       this.set_adapter(this.target.next());
     }
     else if (this.position == 'before') {
-      this.target.before(this.wrap_with_adapter_html(content));
+      this.target.before(this.wrap_with_adapter_html(content, should_refresh_data));
       ActiveScaffold.trigger_load_events(this.target.prev().find('[data-as_load]'));
       this.set_adapter(this.target.prev());
     }
@@ -1201,12 +1210,13 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
   },
   
   set_opened: function() {
+    var should_refresh_data = (typeof(this.refresh_ur)== 'undefined');
     if (this.position == 'after') {
-      var new_adapter = ActiveScaffold.replace(this.target.next(), this.wrap_with_adapter_html(this.target.next().children(':first-child').html()), true);
+      var new_adapter = ActiveScaffold.replace(this.target.next(), this.wrap_with_adapter_html(this.target.next().children(':first-child').html(), should_refresh_data), true);
       this.set_adapter(new_adapter);
     }
     else if (this.position == 'before') {
-      var new_adapter = ActiveScaffold.replace(this.target.prev(), this.wrap_with_adapter_html(this.target.prev().children(':first-child').html()), true);
+      var new_adapter = ActiveScaffold.replace(this.target.prev(), this.wrap_with_adapter_html(this.target.prev().children(':first-child').html(), should_refresh_data), true);
       this.set_adapter(new_adapter);
     }
     this.disable();
@@ -1227,7 +1237,7 @@ ActiveScaffold.Actions.Table = ActiveScaffold.Actions.Abstract.extend({
 ActiveScaffold.ActionLink.Table = ActiveScaffold.ActionLink.Abstract.extend({
   insert: function(content) {
     if (this.position == 'top') {
-      this.target.prepend(this.wrap_with_adapter_html(content));
+      this.target.prepend(this.wrap_with_adapter_html(content, false));
       ActiveScaffold.trigger_load_events(this.target.children().first().find('[data-as_load]'));
       this.set_adapter(this.target.children().first());
     }

data/frontends/default/javascripts/prototype/active_scaffold.js

@@ -209,21 +209,27 @@ document.observe("dom:loaded", function() {
     }
     return true;
   });
-  document.on('ajax:before', 'a.as_paginate', function(event) {
+  document.on('ajax:before', 'div.active-scaffold-footer .pagination a', function(event) {
     var as_paginate = event.findElement();
-    var loading_indicator = as_paginate.up().down('img.loading-indicator');
+    var loading_indicator = as_paginate.up(1).down('img.loading-indicator');
     var history_controller_id = as_paginate.readAttribute('data-page-history');
     
     if (history_controller_id) addActiveScaffoldPageToHistory(as_paginate.readAttribute('href'), history_controller_id);
-    if (loading_indicator) loading_indicator.style.visibility = 'visible';
+    if (loading_indicator == null) {
+      var table_loading_indicator = as_paginate.up('div.active-scaffold').down('div.actions').down('img.loading-indicator');
+      loading_indicator = table_loading_indicator.cloneNode(true);
+      loading_indicator.id = null;
+      as_paginate.up(1).insert({top: loading_indicator});
+    }
+    loading_indicator.style.visibility = 'visible';
     return true;
   });
-  document.on('ajax:failure', 'a.as_paginate', function(event) {
+  document.on('ajax:failure', 'div.active-scaffold-footer .pagination a', function(event) {
     var as_scaffold = event.findElement('.active-scaffold');
     ActiveScaffold.report_500_response(as_scaffold);
     return true;
   });
-  document.on('ajax:complete', 'a.as_paginate', function(event) {
+  document.on('ajax:complete', 'div.active-scaffold-footer .pagination a', function(event) {
     var as_paginate = event.findElement();
     var loading_indicator = as_paginate.up().down('img.loading-indicator');
     
@@ -354,12 +360,12 @@ document.observe("dom:loaded", function() {
   });
   document.on('ajax:before', 'form.as_form', function(event) {
     var as_form = event.findElement('form');
-    element.fire('as:form_submit');
+    as_form.fire('as:form_submit');
     return true;
   });
   document.on('submit', 'form.as_form[data-remote!="true"]', function(event) {
     var as_form = event.findElement('form');
-    element.fire('as:form_submit');
+    as_form.fire('as:form_submit');
     return true;
   });
   ActiveScaffold.trigger_load_events($$('[data-as_load]'));
@@ -934,7 +940,7 @@ ActiveScaffold.ActionLink.Abstract = Class.create({
     this.adapter.store('action_link', this);
   },
 
-  wrap_with_adapter_html: function(content) {
+  wrap_with_adapter_html: function(content, should_refresh_data) {
     // players_view class missing
     var id_string = null;
     var close_label = this.scaffold().readAttribute('data-closelabel');
@@ -950,7 +956,7 @@ ActiveScaffold.ActionLink.Abstract = Class.create({
         id_string = this.target.readAttribute('id').replace('list', 'nested');
     }
 
-    return '<tr class="inline-adapter" id="' + id_string + '"><td colspan="99" class="inline-adapter-cell"><div class="' + this.action + '-view ' + controller +  '-view view"><a class="inline-adapter-close as_cancel" title="' + close_label + '" data-remote="true" data-refresh="false" href="">' + close_label +'</a>' + content + '</div></td></tr>'
+    return '<tr class="inline-adapter" id="' + id_string + '"><td colspan="99" class="inline-adapter-cell"><div class="' + this.action + '-view ' + controller +  '-view view"><a class="inline-adapter-close as_cancel" title="' + close_label + '" data-remote="true" data-refresh="' + should_refresh_data + '" href="">' + close_label +'</a>' + content + '</div></td></tr>'
   }
 });
 
@@ -983,6 +989,7 @@ ActiveScaffold.ActionLink.Record = Class.create(ActiveScaffold.ActionLink.Abstra
   },
 
   insert: function(content) {
+    var should_refresh_data = (typeof(this.refresh_ur)== 'undefined');
     this.close_previous_adapter();
 
     if (this.position == 'replace') {
@@ -991,12 +998,12 @@ ActiveScaffold.ActionLink.Record = Class.create(ActiveScaffold.ActionLink.Abstra
     }
 
     if (this.position == 'after') {
-      this.target.insert({after:this.wrap_with_adapter_html(content)});
+      this.target.insert({after:this.wrap_with_adapter_html(content, should_refresh_data)});
       ActiveScaffold.trigger_load_events(this.target.next().select('[data-as_load]'));
       this.set_adapter(this.target.next());
     }
     else if (this.position == 'before') {
-      this.target.insert({before:this.wrap_with_adapter_html(content)});
+      this.target.insert({before:this.wrap_with_adapter_html(content, should_refresh_data)});
       ActiveScaffold.trigger_load_events(this.target.previous().select('[data-as_load]'));
       this.set_adapter(this.target.previous());
     }
@@ -1029,12 +1036,13 @@ ActiveScaffold.ActionLink.Record = Class.create(ActiveScaffold.ActionLink.Abstra
   },
 
   set_opened: function() {
+    var should_refresh_data = (typeof(this.refresh_ur)== 'undefined');
     if (this.position == 'after') {
-      var new_adapter = ActiveScaffold.replace(this.target.next(), this.wrap_with_adapter_html(this.target.next().childElements().first().innerHTML), true);
+      var new_adapter = ActiveScaffold.replace(this.target.next(), this.wrap_with_adapter_html(this.target.next().childElements().first().innerHTML, should_refresh_data), true);
       this.set_adapter(new_adapter);
     }
     else if (this.position == 'before') {
-      var new_adapter = ActiveScaffold.replace(this.target.previous(), this.wrap_with_adapter_html(this.target.previous().childElements().first().innerHTML), true);
+      var new_adapter = ActiveScaffold.replace(this.target.previous(), this.wrap_with_adapter_html(this.target.previous().childElements().first().innerHTML, should_refresh_data), true);
       this.set_adapter(new_adapter);
     }
     this.disable();
@@ -1055,7 +1063,7 @@ ActiveScaffold.Actions.Table = Class.create(ActiveScaffold.Actions.Abstract, {
 ActiveScaffold.ActionLink.Table = Class.create(ActiveScaffold.ActionLink.Abstract, {
   insert: function(content) {
     if (this.position == 'top') {
-      this.target.insert({top:this.wrap_with_adapter_html(content)});
+      this.target.insert({top:this.wrap_with_adapter_html(content, false)});
       ActiveScaffold.trigger_load_events(this.target.immediateDescendants().first().select('[data-as_load]'));
       this.set_adapter(this.target.immediateDescendants().first());
     }

data/frontends/default/stylesheets/stylesheet.css

@@ -528,7 +528,7 @@ background-color: #005CB8;
 color: #ccc;
 }
 
-.active-scaffold-footer .active-scaffold-pagination {
+.active-scaffold-footer .pagination {
 float: right;
 white-space: nowrap;
 margin-right: 5px;

data/frontends/default/views/_list.html.erb

@@ -8,7 +8,7 @@
   <%= render :partial => 'list_messages', :locals => {:columns => columns} %>
   <tbody class="records" id="<%= active_scaffold_tbody_id %>">
     <% if !@records.empty? -%>
-      <%= render :partial => 'list_record', :collection => @page.items, :locals => { :hidden => false, :columns => columns, :action_links => active_scaffold_config.action_links.member} %>
+      <%= render :partial => 'list_record', :collection => @records, :locals => { :hidden => false, :columns => columns, :action_links => active_scaffold_config.action_links.member} %>
     <% end -%>
     <% if columns.any? {|c| c.calculation?} -%>
       <%= render :partial => 'list_calculations', :locals => {:columns => columns} %>
@@ -16,3 +16,4 @@
   </tbody>
 </table>
 <%= render :partial => 'list_pagination' %>
+<% save_current_page_num %>

data/frontends/default/views/_list_messages.html.erb

@@ -11,7 +11,7 @@
       <p class="filtered-message" <%= ' style="display:none;" '.html_safe unless @filtered %>>
         <%= @filtered.is_a?(Array) ? render(:partial => 'human_conditions', :locals => {:columns => @filtered}) : as_(active_scaffold_config.list.filtered_message) %>
       </p>
-      <p id="<%= empty_message_id %>" class="empty-message" <%= ' style="display:none;" '.html_safe unless @page.items.empty? %>>
+      <p id="<%= empty_message_id %>" class="empty-message" <%= ' style="display:none;" '.html_safe unless @records.empty? %>>
         <%= as_(active_scaffold_config.list.no_entries_message) %>
       </p>
     </td>
@@ -23,7 +23,7 @@
       action_links.add(search_link)  -%>
       <%= render :partial => 'list_actions', :locals => {:record => record, :url_options => params_for(:escape => false, :search => ''), :action_links => action_links.member} %>
     <% else %>
-      <td class='actions'><%= '<p class="empty-message">&nbsp;</p>'.html_safe if @page.items.empty? %></td>
+      <td class='actions'><%= '<p class="empty-message">&nbsp;</p>'.html_safe if @records.empty? %></td>
     <% end -%>
 
   </tr>

data/frontends/default/views/_list_pagination.html.erb

@@ -1,11 +1,8 @@
 <% if active_scaffold_config.list.pagination -%>
 <div class="active-scaffold-footer">
-<% unless @page.pager.infinite? -%>
-  <div class="active-scaffold-found"><span class="active-scaffold-records"><%= @page.pager.count -%></span> <%=as_(:found, :count => @page.pager.count) %></div>
+<% unless active_scaffold_config.list.pagination == :infinite -%>
+  <div class="active-scaffold-found"><span class="active-scaffold-records"><%= @records.total_count -%></span> <%=as_(:found, :count => @records.total_count) %></div>
 <% end -%>
-  <div class="active-scaffold-pagination">
-    <%= render :partial => 'list_pagination_links', :locals => { :current_page => @page } if @page.pager.infinite? || @page.pager.number_of_pages > 1 %>
-  </div>
-  <br clear="both" /><%# a hack for the Rico Corner problem %>
+  <%= paginate @records, :window => active_scaffold_config.list.page_links_window, :params => params_for(:action => :index), :remote => true %>
 </div>
 <% end -%>

data/frontends/default/views/_list_record_columns.html.erb

@@ -1,5 +1,5 @@
 <% columns.each do |column| %>
-  <% authorized = record.authorized_for?(:crud_type => :read, :column => column.name) -%>
+  <% authorized = record.authorized_for_read_column?(column.name) -%>
   <% column_value = authorized ? get_column_value(record, column) : active_scaffold_config.list.empty_field_text -%>
 
   <td class="<%= column_class(column, column_value, record) %>" >

data/lib/active_scaffold/actions/list.rb

@@ -3,6 +3,7 @@ module ActiveScaffold::Actions
     def self.included(base)
       base.before_filter :list_authorized_filter, :only => [:index, :row]
       base.helper_method :list_columns
+      base.helper_method :save_current_page_num
     end
 
     def index
@@ -73,12 +74,8 @@ module ActiveScaffold::Actions
           })
       end
 
-      page = find_page(options);
-      if page.items.blank? && !page.pager.infinite?
-        page = page.pager.last
-        active_scaffold_config.list.user.page = page.number
-      end
-      @page, @records = page, page.items
+      @records = find_page(options);
+      @records
     end
 
     def each_record_in_page
@@ -174,6 +171,10 @@ module ActiveScaffold::Actions
       (default_formats + active_scaffold_config.formats).uniq
     end
 
+    def save_current_page_num
+      active_scaffold_config.list.user.page = @records.current_page unless active_scaffold_config.list.pagination == false
+    end
+
     private
     def list_authorized_filter
       raise ActiveScaffold::ActionNotAllowed unless list_authorized?

data/lib/active_scaffold/active_record_permissions.rb

@@ -64,6 +64,7 @@ module ActiveRecordPermissions
     def self.included(base)
       base.extend SecurityMethods
       base.send :include, SecurityMethods
+      base.class_attribute :auth_column_read_methods
     end
 
     # Because any class-level queries get delegated to the instance level via a new record,
@@ -110,6 +111,30 @@ module ActiveRecordPermissions
         return ActiveRecordPermissions.default_permission
       end
 
+      def authorized_for_read_column?(column)
+        self.class.auth_column_read_methods ||= {}
+        methods = self.class.auth_column_read_methods[column]
+        if methods.nil?
+          method = column_and_crud_type_security_method(column, :read)
+          methods = if method && respond_to?(method)
+            [method]
+          else
+            [column_security_method(column),
+            crud_type_security_method(:read)].compact.select {|m| respond_to?(m)}
+          end
+          self.class.auth_column_read_methods[column] = methods
+        end
+
+        # if any method returns false, then return false
+        return false if methods.any? {|m| !send(m)}
+
+        # if any method actually exists then it must've returned true, so return true
+        return true unless methods.empty?
+
+        # if no method exists, return the default permission
+        return ActiveRecordPermissions.default_permission
+      end
+
       private
 
       def column_security_method(column)

data/lib/active_scaffold/attribute_params.rb

@@ -135,8 +135,11 @@ module ActiveScaffold
         # convert empty strings into nil. this works better with 'null => true' columns (and validations),
         # and 'null => false' columns should just convert back to an empty string.
         # ... but we can at least check the ConnectionAdapter::Column object to see if nulls are allowed
-        value = nil if value.is_a? String and value.empty? and !column.column.nil? and column.column.null
-        value
+        if value.is_a? String and value.empty? and !column.column.nil? and column.column.null
+          nil
+        else
+          column.stripped_value(value)
+        end
       end
     end
 

data/lib/active_scaffold/bridges/shared/date_bridge.rb

@@ -73,13 +73,13 @@ module ActiveScaffold
               range_type, range = value[:range].downcase.split('_')
               format = active_scaffold_human_condition_date_bridge_range_format(range_type, range)
               from, to = controller.class.date_bridge_from_to(column, value)
-              "#{column.active_record_class.human_attribute_name(column.name)} = #{as_(value[:range].downcase).downcase} (#{I18n.l(from, :format => format)})"
+              "#{column.active_record_class.human_attribute_name(column.name)} = #{as_(value[:range].downcase).downcase} (#{I18n.l(from, :format => format)})" unless from.nil?
             when 'PAST', 'FUTURE'
               from, to = controller.class.date_bridge_from_to(column, value)
-              "#{column.active_record_class.human_attribute_name(column.name)} #{as_('BETWEEN'.downcase).downcase} #{I18n.l(from)} - #{I18n.l(to)}"
+              "#{column.active_record_class.human_attribute_name(column.name)} #{as_('BETWEEN'.downcase).downcase} #{I18n.l(from)} - #{I18n.l(to)}" unless from.nil? || to.nil?
             else
               from, to = controller.class.date_bridge_from_to(column, value)
-              "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value[:opt].downcase).downcase} #{I18n.l(from)} #{value[:opt] == 'BETWEEN' ? '- ' + I18n.l(to) : ''}"
+              "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value[:opt].downcase).downcase} #{I18n.l(from)} #{value[:opt] == 'BETWEEN' ? '- ' + I18n.l(to) : ''}" unless from.nil? || (value[:opt] == 'BETWEEN' && to.nil?)
             end
           end
 

data/lib/active_scaffold/bridges/tiny_mce/public/javascripts/prototype/tiny_mce_bridge.js

@@ -7,7 +7,7 @@ document.on('as:form_loaded', 'form.as_form', function(event) {
   });
 document.on('as:form_submit', 'form.as_form', function(event) {
     var as_form = event.findElement('form');
-    if (as_form.has('textarea.mceEditor').length > 0) {
+    if (as_form.select('textarea.mceEditor').length > 0) {
       tinyMCE.triggerSave();
     }
     return true;

data/lib/active_scaffold/config/core.rb

@@ -167,7 +167,14 @@ module ActiveScaffold::Config
       klass = "ActiveScaffold::Config::#{titled_name}".constantize rescue nil
       if klass
         if @actions.include? underscored_name
-          return @action_configs[underscored_name] ||= klass.new(self)
+          @action_configs[name] ||= klass.new(self)
+          eigenclass = class << self; self; end
+          eigenclass.class_eval do
+            define_method(name) do
+              @action_configs[name]
+            end
+          end
+         return send(name)
         else
           raise "#{titled_name} is not enabled. Please enable it or remove any references in your configuration (e.g. config.#{underscored_name}.columns = [...])."
         end

data/lib/active_scaffold/config/field_search.rb

@@ -6,6 +6,7 @@ module ActiveScaffold::Config
       @core = core_config
 
       @text_search = self.class.text_search
+      @or_delimiter = self.class.or_delimiter
 
       # start with the ActionLink defined globally
       @link = self.class.link.clone
@@ -28,6 +29,11 @@ module ActiveScaffold::Config
     cattr_accessor :text_search
     @@text_search = :full
 
+    # delimiter to seperate or search string such us: name = Paul,Bernd,Klaus
+    # will search for Paul Or Bernd Or Klaus
+    cattr_accessor :or_delimiter
+    @@or_delimiter = ','
+
     # instance-level configuration
     # ----------------------------
 
@@ -50,18 +56,33 @@ module ActiveScaffold::Config
     # * false: LIKE ?
     # Default is :full
     attr_accessor :text_search
+
+    attr_accessor :or_delimiter
     
     # the ActionLink for this action
     attr_accessor :link
     
     # rarely searched columns may be placed in a hidden subgroup
-     def optional_columns=(optionals)
+    def optional_columns=(optionals)
       @optional_columns= Array(optionals)
     end
     
     def optional_columns
       @optional_columns ||= []
     end
+
+    # columns which should support or searches
+    # eg like 'x' or ... like 'y'
+    def or_columns=(or_columns)
+      @or_columns = Array(or_columns)
+    end
+
+    def or_columns
+      unless @or_columns
+        self.or_columns = @core.columns.collect{|c| c.name if @core.columns._inheritable.include?(c.name) and c.searchable? and c.column and c.column.text?}.compact
+      end
+      @or_columns
+    end
     
     # default search params
     # default_params = {:title => {"from"=>"test", "to"=>"", "opt"=>"%?%"}} 

data/lib/active_scaffold/data_structures/column.rb

@@ -181,6 +181,17 @@ module ActiveScaffold::DataStructures
     # to modify the default order of columns
     attr_accessor :weight
 
+    # whether the field should be stripped when search values or form values are read for this value
+    attr_writer :stripable
+    def stripable?
+      @stripable
+    end
+
+    def stripped_value(value)
+      stripable? ? value.strip : value
+    end
+
+
     # to set how many associated records a column with plural association must show in list
     cattr_accessor :associated_limit
     @@associated_limit = 3
@@ -228,6 +239,11 @@ module ActiveScaffold::DataStructures
     def plural_association?
       self.association and [:has_many, :has_and_belongs_to_many].include? self.association.macro
     end
+
+    def belongs_to_association?
+      self.association && self.association.macro == :belongs_to
+    end
+
     def through_association?
       self.association and self.association.options[:through]
     end
@@ -278,6 +294,7 @@ module ActiveScaffold::DataStructures
       @options = {:format => :i18n_number} if @column.try(:number?)
       @form_ui = :checkbox if @column and @column.type == :boolean
       @form_ui = :textarea if @column and @column.type == :text
+      @stripable = true if @column and @column.text?
       @allow_add_existing = true
       @form_ui = self.class.association_form_ui if @association && self.class.association_form_ui
       
@@ -311,7 +328,7 @@ module ActiveScaffold::DataStructures
         self.sort = false
       else
         if self.singular_association?
-          self.sort = {:method => "#{self.name}.to_label"}
+          self.sort = {:method => "#{self.name}.nil? ? '' : #{self.name}.to_label"}
         elsif self.plural_association?
           self.sort = {:method => "#{self.name}.join(',')"}
         else
@@ -322,7 +339,7 @@ module ActiveScaffold::DataStructures
     
     def initialize_search_sql
       self.search_sql = unless self.virtual?
-        if association.nil?
+        if association.nil? || self.belongs_to_association?
           self.field.to_s
         elsif !self.polymorphic_association?
           [association.klass.table_name, association.klass.primary_key].collect! do |str|

data/lib/active_scaffold/finder.rb

@@ -83,21 +83,28 @@ module ActiveScaffold
         end
       end
 
+
       def condition_for_range(column, value, like_pattern = nil)
         if !value.is_a?(Hash)
           if column.column.nil? || column.column.text?
-            ["#{column.search_sql} #{ActiveScaffold::Finder.like_operator} ?", like_pattern.sub('?', value)]
+            ["#{column.search_sql} #{ActiveScaffold::Finder.like_operator} ?", like_pattern.sub('?', column.stripped_value(value))]
           else
             ["#{column.search_sql} = ?", column.column.type_cast(value)]
           end
         elsif value[:from].blank?
           nil
         elsif ActiveScaffold::Finder::StringComparators.values.include?(value[:opt])
-          ["#{column.search_sql} #{ActiveScaffold::Finder.like_operator} ?", value[:opt].sub('?', value[:from])]
+          if(active_scaffold_config.field_search.or_columns.include? column.name)
+            search_values = column.stripped_value(value[:from]).split(active_scaffold_config.field_search.or_delimiter).compact
+            sql_prepared_statement = search_values.collect {|search_value| "#{column.search_sql} #{ActiveScaffold::Finder.like_operator} ?"}.join(' OR ')
+            [sql_prepared_statement] + search_values.collect{|search_value| value[:opt].sub('?', column.stripped_value(search_value))}
+          else
+            ["#{column.search_sql} #{ActiveScaffold::Finder.like_operator} ?", value[:opt].sub('?', column.stripped_value(value[:from]))]
+          end
         elsif value[:opt] == 'BETWEEN'
-          ["#{column.search_sql} BETWEEN ? AND ?", value[:from], value[:to]]
+          ["#{column.search_sql} BETWEEN ? AND ?", column.stripped_value(value[:from]), column.stripped_value(value[:to])]
         elsif ActiveScaffold::Finder::NumericComparators.include?(value[:opt])
-          ["#{column.search_sql} #{value[:opt]} ?", value[:from]]
+          ["#{column.search_sql} #{value[:opt]} ?", column.stripped_value(value[:from])]
         else
           nil
         end
@@ -243,7 +250,7 @@ module ActiveScaffold
       return record
     end
 
-    # returns a Paginator::Page (not from ActiveRecord::Paginator) for the given parameters
+    # returns a records relation for the current page
     # options may include:
     # * :sorting - a Sorting DataStructure (basically an array of hashes of field => direction, e.g. [{:field1 => 'asc'}, {:field2 => 'desc'}]). please note that multi-column sorting has some limitations: if any column in a multi-field sort uses method-based sorting, it will be ignored. method sorting only works for single-column sorting.
     # * :per_page
@@ -256,6 +263,7 @@ module ActiveScaffold
       full_includes = (active_scaffold_includes.blank? ? nil : active_scaffold_includes)
       options[:per_page] ||= 999999999
       options[:page] ||= 1
+       #TODO not supported by kaminari
       options[:count_includes] ||= full_includes unless search_conditions.nil?
 
       klass = beginning_of_chain
@@ -264,37 +272,19 @@ module ActiveScaffold
       finder_options = { :order => options[:sorting].try(:clause),
                          :where => search_conditions,
                          :joins => joins_for_finder,
-                         :includes => options[:count_includes]}
+                         :includes => add_association_to_includes_for_sorting(options[:sorting], full_includes)}
 
 
       finder_options.merge! custom_finder_options
 
-      # NOTE: we must use :include in the count query, because some conditions may reference other tables
-      count_query = append_to_query(klass, finder_options.reject{|k, v| [:select, :order].include?(k)})
-      count = count_query.count unless options[:pagination] == :infinite
-  
-      # Converts count to an integer if ActiveRecord returned an OrderedHash
-      # that happens when finder_options contains a :group key
-      count = count.length if count.is_a? ActiveSupport::OrderedHash
-
-      full_includes = add_association_to_includes_for_sorting(options[:sorting], full_includes)
-
-      finder_options.merge! :includes => full_includes
-
       # we build the paginator differently for method- and sql-based sorting
-      if options[:sorting] and options[:sorting].sorts_by_method?
-        pager = ::Paginator.new(count, options[:per_page]) do |offset, per_page|
-          sorted_collection = sort_collection_by_column(append_to_query(klass, finder_options).all, *options[:sorting].first)
-          sorted_collection = sorted_collection.slice(offset, per_page) if options[:pagination]
-          sorted_collection
-        end
+      records = if options[:sorting] && options[:sorting].sorts_by_method?
+        Kaminari.paginate_array(sort_collection_by_column(append_to_query(klass, finder_options).all, *options[:sorting].first))
       else
-        pager = ::Paginator.new(count, options[:per_page]) do |offset, per_page|
-          finder_options.merge!(:offset => offset, :limit => per_page) if options[:pagination]
-          append_to_query(klass, finder_options).all
-        end
+        append_to_query(klass, finder_options)
       end
-      pager.page(options[:page])
+      records = records.page(options[:page]).per(options[:per_page]) if options[:pagination]
+      records
     end
 
     # if someone excludes association from includes in configuration
@@ -349,7 +339,6 @@ module ActiveScaffold
 
     # TODO: this should reside on the column, not the controller
     def sort_collection_by_column(collection, column, order)
-      Rails.logger.info("das hier ja was bin im sort_collection")
       sorter = column.sort[:method]
       collection = collection.sort_by { |record|
         value = (sorter.is_a? Proc) ? record.instance_eval(&sorter) : record.instance_eval(sorter)