active_scaffold-sequel 0.5.1 → 0.6.0

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

@@ -38,6 +38,29 @@ jQuery(document).ready(function() {
     }
     return true;
   });
+  jQuery('a.as_action.marked_records_action').live('ajax:before', function(event) {
+    var action_link = jQuery(this);
+    var marked_records = 'marked_records=' + ActiveScaffold.marked_records.join('%2C');
+    var regexp = /(\?|&)marked_records=[^&]*/g;
+    var match;
+    if (action_link.search[0] == '?') {
+      match = regexp.exec(action_link.search);
+      if (match) {
+        action_link.search = action_link.search.slice(0, match.index) + match[1] + marked_records + action_link.search.slice(regexp.lastIndex, action_link.search.length);
+      } else {
+        action_link.search = action_link.search + '&' + marked_records;
+      }
+    } else {
+      action_link.search = '?' + marked_records;
+    }
+    return true;
+  });
+  jQuery('a.as_action.marked_records_action').live('ajax:complete', function(event) {
+    var action_link = jQuery(this);
+    ActiveScaffold.mark_records(action_link.readAttribute('data-tbody_id'), false);
+    ActiveScaffold.marked_records = [];
+    return true;
+  });
   jQuery('a.as_action').live('ajax:success', function(event, response) {
     var action_link = ActiveScaffold.ActionLink.get(jQuery(this));
     if (action_link) {
@@ -111,7 +134,7 @@ jQuery(document).ready(function() {
     ActiveScaffold.report_500_response(as_scaffold);
     return true;
   });
-  jQuery('span.in_place_editor_field').live('hover', function(event) {
+  jQuery('span.mark_record_field,span.mark_heading,span.in_place_editor_field').live('hover', function(event) {
     jQuery(this).data(); // $ 1.4.2 workaround
     if (event.type == 'mouseenter') {
       if (typeof(jQuery(this).data('editInPlace')) === 'undefined') jQuery(this).addClass("hover");
@@ -121,6 +144,19 @@ jQuery(document).ready(function() {
     }
     return true;
   });
+  jQuery('span.mark_record_field').live('click', function(event) {
+    ActiveScaffold.mark_span(jQuery(this));
+  });
+  jQuery('span.mark_heading').live('click', function(event) {
+    var span = jQuery(this);
+    var checkbox = span.find('input[type="checkbox"]').first();
+    var tbody_id = span.attr('data-tbody_id');
+    if (checkbox.checked) {
+      ActiveScaffold.mark_records(tbody_id, true);
+    } else {
+      ActiveScaffold.mark_records(tbody_id, false);
+    }
+  });
   jQuery('span.in_place_editor_field').live('click', function(event) {
     ActiveScaffold.in_place_editor_field_clicked(jQuery(this));
   });
@@ -653,28 +689,37 @@ var ActiveScaffold = {
     });
   },
 
-  // element is tbody id
-  mark_records: function(element, options) {
-    if (typeof(element) == 'string') element = '#' + element;
-    var element = jQuery(element);
-    var mark_checkboxes = jQuery('#' + element.attr('id') + ' > tr.record td.marked-column input[type="checkbox"]');
-    mark_checkboxes.each(function (index) {
-      var item = jQuery(this);
-     if(options.checked === true) {
-       item.attr('checked', 'checked');
-     } else {
-       item.removeAttr('checked');
-     }
-     item.attr('value', ('' + !options.checked));
-    });
-    if(options.include_mark_all === true) {
-      var mark_all_checkbox = element.prev('thead').find('th.marked-column_heading span input[type="checkbox"]');
-      if(options.checked === true) {
-        mark_all_checkbox.attr('checked', 'checked');
-      } else {
-        mark_all_checkbox.removeAttr('checked');
+  mark_span: function(span, mark_flag) {
+    var record_id = span.attr('data-ie_id');
+    var checkbox = span.find('input[type="checkbox"]').first();
+    if (mark_flag == false || (typeof(mark_flag) == 'undefined' && !checkbox.checked)) {
+      ActiveScaffold.unmark_record(record_id);
+    } else {
+      ActiveScaffold.mark_record(record_id);
+    }
+    return checkbox;
+  },
+
+  mark_records: function(tbody_id, mark_flag) {
+    var spans = $('#' + tbody_id + ' > tr.record td.marked-column span.mark_record_field');
+    var checkbox;
+    for (var i = 0; i < spans.length; i++) {
+      checkbox = ActiveScaffold.mark_span(spans[i], mark_flag);
+      checkbox.checked = mark_flag;
+    }
+  },
+
+  marked_records: [],
+
+  mark_record: function(record_id) {
+    ActiveScaffold.marked_records.push(record_id);
+  },
+
+  unmark_record: function(record_id) {
+    for (var i = ActiveScaffold.marked_records.length - 1; i >= 0; i--) {
+      if (ActiveScaffold.marked_records[i] == record_id) {
+        ActiveScaffold.marked_records.splice(i, 1);
       }
-      mark_all_checkbox.attr('value', ('' + !options.checked));
     }
   },
 

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

@@ -61,6 +61,29 @@ document.observe("dom:loaded", function() {
     }
     return true;
   });
+  document.on('ajax:before', 'a.as_action.marked_records_action', function(event) {
+    var action_link = event.findElement();
+    var marked_records = 'marked_records=' + ActiveScaffold.marked_records.join('%2C');
+    var regexp = /(\?|&)marked_records=[^&]*/g;
+    var match;
+    if (action_link.search[0] == '?') {
+      match = regexp.exec(action_link.search);
+      if (match) {
+        action_link.search = action_link.search.slice(0, match.index) + match[1] + marked_records + action_link.search.slice(regexp.lastIndex, action_link.search.length);
+      } else {
+        action_link.search = action_link.search + '&' + marked_records;
+      }
+    } else {
+      action_link.search = '?' + marked_records;
+    }
+    return true;
+  });
+  document.on('ajax:complete', 'a.as_action.marked_records_action', function(event) {
+    var action_link = event.findElement();
+    ActiveScaffold.mark_records(action_link.readAttribute('data-tbody_id'), false);
+    ActiveScaffold.marked_records = [];
+    return true;
+  });
   document.on('ajax:success', 'a.as_action', function(event) {
     var action_link = ActiveScaffold.ActionLink.get(event.findElement());
     if (action_link && event.memo && event.memo.request) {
@@ -135,15 +158,28 @@ document.observe("dom:loaded", function() {
     ActiveScaffold.report_500_response(as_scaffold);
     return true;
   });
-  document.on('mouseover', 'span.in_place_editor_field', function(event) {
+  document.on('mouseover', 'span.mark_record_field,span.mark_heading,span.in_place_editor_field', function(event) {
       event.findElement().addClassName('hover');
   });
-  document.on('mouseout', 'span.in_place_editor_field', function(event) {
+  document.on('mouseout', 'span.mark_record_field,span.mark_heading,span.in_place_editor_field', function(event) {
       event.findElement().removeClassName('hover');
   });
+  document.on('click', 'span.mark_record_field', function(event) {
+    ActiveScaffold.mark_span(event.findElement('span.mark_record_field'));
+  });
+  document.on('click', 'span.mark_heading', function(event) {
+    var span = event.findElement('span.mark_heading');
+    var checkbox = span.down('input[type="checkbox"]');
+    var tbody_id = span.readAttribute('data-tbody_id');
+    if (checkbox.checked) {
+      ActiveScaffold.mark_records(tbody_id, true);
+    } else {
+      ActiveScaffold.mark_records(tbody_id, false);
+    }
+  });
   document.on('click', 'span.in_place_editor_field', function(event) {
     var span = event.findElement('span.in_place_editor_field');
-    
+
     if (typeof(span.inplace_edit) === 'undefined') {
       var options = {htmlResponse: false,
                      onEnterHover: null,
@@ -159,14 +195,14 @@ document.observe("dom:loaded", function() {
       if(!(my_parent.nodeName.toLowerCase() === 'td' || my_parent.nodeName.toLowerCase() === 'th')){
           my_parent = span.up('td');
       }
-          
+
       if (my_parent.nodeName.toLowerCase() === 'td') {
         var heading_selector = '.' + span.up().readAttribute('class').split(' ')[0] + '_heading';
         column_heading = span.up('.active-scaffold').down(heading_selector);
       } else if (my_parent.nodeName.toLowerCase() === 'th') {
         column_heading = my_parent;
       }
-          
+
       var render_url = column_heading.readAttribute('data-ie_render_url'),
           mode = column_heading.readAttribute('data-ie_mode'),
           record_id = span.readAttribute('data-ie_id');
@@ -188,7 +224,7 @@ document.observe("dom:loaded", function() {
         }
         options['params'] += ("eid=" + span.up('div.active-scaffold').readAttribute('data-eid'));
       }
-            
+
       if (mode === 'clone') {
         options.nodeIdSuffix = record_id;
         options.inplacePatternSelector = '#' + column_heading.readAttribute('id') + ' .as_inplace_pattern';
@@ -583,26 +619,41 @@ var ActiveScaffold = {
     );
   },
 
-  // element is tbody id
-  mark_records: function(element, options) {
-    var element = $(element);
-    var mark_checkboxes = $$('#' + element.readAttribute('id') + ' > tr.record td.marked-column input[type="checkbox"]');
-    mark_checkboxes.each(function(item) {
-     if(options.checked === true) {
-       item.writeAttribute({ checked: 'checked' });
-     } else {
-       item.removeAttribute('checked');
-     }
-     item.writeAttribute('value', ('' + !options.checked));
-    });
-    if(options.include_mark_all === true) {
-      var mark_all_checkbox = element.previous('thead').down('th.marked-column_heading span input[type="checkbox"]');
-      if(options.checked === true) {
-        mark_all_checkbox.writeAttribute({ checked: 'checked' }); 
-      } else {
-        mark_all_checkbox.removeAttribute('checked');
+  mark_span: function(span, mark_flag) {
+    var record_id = span.readAttribute('data-ie_id');
+    var checkbox = span.down('input[type="checkbox"]');
+    /*
+      when the "mark_flag" is "undefined", the "checked" attribute is already set to the new value,
+      when the "mark_flag" is defined (this function is called by the "mark_records" function), the "checked" attribute is still set to the old value
+    */
+    if (mark_flag == false || (typeof(mark_flag) == 'undefined' && !checkbox.checked)) {
+      ActiveScaffold.unmark_record(record_id);
+    } else {
+      ActiveScaffold.mark_record(record_id);
+    }
+    return checkbox;
+  },
+
+  mark_records: function(tbody_id, mark_flag) {
+    var spans = $$('#' + tbody_id + ' > tr.record td.marked-column span.mark_record_field');
+    var checkbox;
+    for (var i = 0; i < spans.length; i++) {
+      checkbox = ActiveScaffold.mark_span(spans[i], mark_flag);
+      checkbox.checked = mark_flag;
+    }
+  },
+
+  marked_records: [],
+
+  mark_record: function(record_id) {
+    ActiveScaffold.marked_records.push(record_id);
+  },
+
+  unmark_record: function(record_id) {
+    for (var i = ActiveScaffold.marked_records.length - 1; i >= 0; i--) {
+      if (ActiveScaffold.marked_records[i] == record_id) {
+        ActiveScaffold.marked_records.splice(i, 1);
       }
-      mark_all_checkbox.writeAttribute('value', ('' + !options.checked));
     }
   },
 

data/doc/README.mark

@@ -0,0 +1,30 @@
+#########
+# HOWTO #
+#########
+
+1) add the :mark action
+2) use css class "marked_records_action" for actions working with marked records
+3) use the controller method "marked_records" to retrieve the IDs of marked records
+
+########################################
+# Example code for Comments controller #
+########################################
+
+config.actions.add :mark
+config.action_links.add('delete_selected', :label => 'Delete selected comments', :type => :collection, :method => :post,
+  :position => false, :html_options => {:class => 'marked_records_action'})
+
+...
+
+def delete_selected
+  record_ids = marked_records
+  Comment.where(:id => record_ids).all.each do |comment|
+    comment.deleted = true
+    comment.save(:columns => [:deleted], :validate => false)
+  end
+  render :update do |page|
+    record_ids.each do |record_id|
+      page.remove(element_row_id(:action => 'list', :id => record_id))
+    end
+  end
+end

data/frontends/default/views/update_column.js.erb

@@ -1,16 +1,14 @@
-<% @column_span_id ||= element_cell_id(:id => @record.id.to_s, :action => 'update_column', :name => params[:column]) %>
-<% unless controller.send :successful?%>
-  alert('<%= escape_javascript(@record.errors.full_messages.join("\n"))%>');
-  <% @record.reload%>
-<% end%>
-<% column = active_scaffold_config.columns[params[:column]]%>
-<% if column.inplace_edit%>
-  ActiveScaffold.replace_html('<%=@column_span_id%>','<%=escape_javascript(get_column_value(@record, column))%>');
-<% else%>
-  <% formatted_value = get_column_value(@record, column)%>
-  ActiveScaffold.replace_html('<%=@column_span_id%>','<%=escape_javascript(formatted_value)%>');
-<% end%>
-<% if column.calculation?%>
- ActiveScaffold.replace_html('<%=active_scaffold_calculations_id(column)%>', '<%=escape_javascript(render_column_calculation(column))%>');
-<% end%>
-
+<% @column_span_id ||= element_cell_id(:id => @record.id.to_s, :action => 'update_column', :name => @column.name) -%>
+<% unless controller.send :successful? -%>
+  alert('<%= escape_javascript(@record.errors.full_messages.join("\n")) %>');
+  <% @record.reload -%>
+<% end -%>
+<% if @column.inplace_edit -%>
+  ActiveScaffold.replace_html('<%= @column_span_id %>','<%= escape_javascript(get_column_value(@record, @column)) %>');
+<% else -%>
+  <% formatted_value = get_column_value(@record, @column)%>
+  ActiveScaffold.replace_html('<%= @column_span_id %>','<%= escape_javascript(formatted_value) %>');
+<% end -%>
+<% if @column.calculation? %>
+ ActiveScaffold.replace_html('<%= active_scaffold_calculations_id(@column) %>', '<%= escape_javascript(render_column_calculation(@column)) %>');
+<% end -%>

data/lib/active_scaffold/actions/core.rb

@@ -71,13 +71,10 @@ module ActiveScaffold::Actions
       end
     end
 
-    def marked_records
-      active_scaffold_session_storage[:marked_records] ||= Set.new
-    end
-    
     def default_formats
       [:html, :js, :json, :xml, :yaml]
     end
+
     # Returns true if the client accepts one of the MIME types passed to it
     # ex: accepts? :html, :xml
     def accepts?(*types)

data/lib/active_scaffold/actions/delete.rb

@@ -52,7 +52,6 @@ module ActiveScaffold::Actions
       @record ||= destroy_find_record
       begin
         self.successful = @record.destroy
-        marked_records.delete @record.id.to_s if successful?
       rescue
         flash[:warning] = as_(:cant_destroy_record, :record => @record.to_label)
         self.successful = false

data/lib/active_scaffold/actions/mark.rb

@@ -1,75 +1,17 @@
 module ActiveScaffold::Actions
   module Mark
-
     def self.included(base)
-      base.before_filter :mark_authorized?, :only => :mark
-      #base.prepend_before_filter :assign_marked_records_to_model
       base.helper_method :marked_records
     end
 
-    def mark_all
-      if mark_all? || mark_all_scope_forced?
-        do_mark_all
-      else
-        do_unmark
-      end
-      respond_to_action(:mark_all)
-    end
     protected
 
-    def mark_all_respond_to_html
-      do_list
-      list_respond_to_html
-    end
-
-    def mark_all_respond_to_js
-      do_list
-      render :action => 'on_mark_all', :locals => {:mark_all => mark_all?}
-    end
- 
-    # We need to give the ActiveRecord classes a handle to currently marked records. We don't want to just pass the object,
-    # because the object may change. So we give ActiveRecord a proc that ties to the
-    # marked_records_method on this ApplicationController.
-    def assign_marked_records_to_model
-      active_scaffold_config.model.marked_records = marked_records
-    end
-
-    def mark?
-      params[:value] == 'true'
-    end
-    
-    def mark_all?
-      @mark_all ||= [true, 'true', 1, '1', 'T', 't'].include?(params[:value].class == String ? params[:value].downcase : params[:value])
-    end
-
-    def mark_all_scope_forced?
-      !params[:mark_target].nil? && params[:mark_target]=='scope'
-    end
-    
-    def do_mark_all
-      if active_scaffold_config.mark.mark_all_mode == :page && !mark_all_scope_forced? then
-        each_record_in_page {|record| marked_records << record.id}
-      else
-        each_record_in_scope {|record| marked_records << record.id}
-      end
-    end
-
-    def do_demark_all
-      if active_scaffold_config.mark.mark_all_mode == :page then
-        each_record_in_page {|record| marked_records.delete(record.id)}
+    def marked_records
+      if params[:marked_records]
+        params[:marked_records].split(',').collect {|x| Integer(x)}.uniq
       else
-        each_record_in_scope {|record| marked_records.delete(record.id)}
+        []
       end
     end
-    
-    # The default security delegates to ModelPermissions.
-    # You may override the method to customize.
-    def mark_authorized?
-      authorized_for?(:crud_type => :read)
-    end
-
-    def mark_all_formats
-      (default_formats + active_scaffold_config.formats).uniq
-    end
   end
 end

data/lib/active_scaffold/actions/update.rb

@@ -97,17 +97,25 @@ module ActiveScaffold::Actions
     end
 
     def do_update_column
-      @record = active_scaffold_config.model.find(params[:id])
-      if @record.authorized_for?(:crud_type => :update, :column => params[:column])
-        column = active_scaffold_config.columns[params[:column].to_sym]
-        params[:value] ||= @record.column_for_attribute(params[:column]).default unless @record.column_for_attribute(params[:column]).nil? || @record.column_for_attribute(params[:column])[:allow_null]
-        unless column.nil?
-          params[:value] = column_value_from_param_value(@record, column, params[:value])
-          params[:value] = [] if params[:value].nil? && column.form_ui && column.plural_association?
+      # delete from params so update :table won't break urls, also they shouldn't be used in sort links too
+      value = params.delete(:value)
+      column = params.delete(:column).to_sym
+      params.delete(:original_html)
+      params.delete(:original_value)
+
+      @record = find_if_allowed(params[:id], :read)
+      if @record.authorized_for?(:crud_type => :update, :column => column)
+        @column = active_scaffold_config.columns[column]
+        value ||= unless @column.column.nil? || @column.column.null
+          @column.column.default == true ? false : @column.column.default
+        end
+        unless @column.nil?
+          value = column_value_from_param_value(@record, @column, value)
+          value = [] if value.nil? && @column.form_ui && @column.plural_association?
         end
-        @record.send("#{params[:column]}=", params[:value])
+        @record.send("#{@column.name}=", value)
         before_update_save(@record)
-        @record.save
+        self.successful = @record.save
         after_update_save(@record)
       end
     end