active_scaffold_vho 3.1.4 → 3.1.5

data/app/assets/javascripts/jquery/active_scaffold.js

@@ -118,7 +118,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($(this));
     var refresh_data = as_cancel.attr('data-refresh');
 
     if (action_link && action_link.position && refresh_data === 'true' && action_link.refresh_url) {
@@ -158,19 +158,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:error', function(event, xhr, status, error) {
+  $('div.active-scaffold-footer .pagination a').live('ajax:error', function(event, xhr, status, error) {
     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;
   });
@@ -663,7 +671,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();
     }
@@ -1101,7 +1109,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');
@@ -1117,7 +1125,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>'
   }
 });
 
@@ -1154,6 +1162,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') {
@@ -1162,12 +1171,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());
     }
@@ -1202,12 +1211,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();
@@ -1228,7 +1238,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/app/assets/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');
     
@@ -333,12 +339,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]'));
@@ -902,7 +908,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');
@@ -918,7 +924,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>'
   }
 });
 
@@ -951,6 +957,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') {
@@ -959,12 +966,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());
     }
@@ -997,12 +1004,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();
@@ -1023,7 +1031,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/app/assets/stylesheets/active_scaffold_core.css.erb

@@ -529,7 +529,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.rb

@@ -212,6 +212,16 @@ module ActiveScaffold
         self.append_view_path(ActionView::ActiveScaffoldResolver.new(path))
       end
       self._add_sti_create_links if self.active_scaffold_config.add_sti_create_links?
+      #self.create_list_column_helpers
+    end
+
+    def create_list_column_helpers
+      active_scaffold_config.list.columns.each do |column|
+         method_code = self.helpers.generate_list_column_helper_code(column)
+         helper do
+           eval(method_code)
+         end unless self.helpers.column_controller_override?(column)
+      end
     end
 
     # To be called after include action modules

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
@@ -160,6 +157,10 @@ module ActiveScaffold::Actions
     def action_update_respond_to_yaml
       render :text => successful? ? "" : Hash.from_xml(response_object.to_xml(:only => list_columns_names)).to_yaml, :content_type => Mime::YAML, :status => response_status
     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

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

@@ -134,8 +134,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/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,6 +56,8 @@ module ActiveScaffold::Config
     # * false: LIKE ?
     # Default is :full
     attr_accessor :text_search
+
+    attr_accessor :or_delimiter
     
     # the ActionLink for this action
     attr_accessor :link
@@ -62,6 +70,19 @@ module ActiveScaffold::Config
     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"=>"%?%"}}