active_scaffold 3.2.6 → 3.2.7

data/CHANGELOG

@@ -1,3 +1,9 @@
+= 3.2.7 (not released)
+- restore missing update.persistent feature
+- fix create.persistent
+- add new record in first scaffold, not in all nested scaffolds
+- fix deleting all in habtm with select_ui
+
 = 3.2.6
 - fix ordering with DISTINCT call
 - allow to override some human condition strings in i18n, and translate select values for non-association columns

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

@@ -356,8 +356,7 @@ var ActiveScaffold = {
   },
   hide_empty_message: function(tbody) {
     if (this.records_for(tbody).length != 0) {
-      var empty_message_node = jQuery(tbody).parent().find('tbody.messages p.empty-message')
-      if (empty_message_node) empty_message_node.hide();
+      jQuery(tbody).parent().find('tbody.messages p.empty-message').hide();
     }
   },
   reload_if_empty: function(tbody, url) {
@@ -380,14 +379,14 @@ var ActiveScaffold = {
   decrement_record_count: function(scaffold) {
     // decrement the last record count, firsts record count are in nested lists
     if (typeof(scaffold) == 'string') scaffold = '#' + scaffold; 
-    scaffold = jQuery(scaffold)
+    scaffold = jQuery(scaffold);
     count = scaffold.find('span.active-scaffold-records').last();
     if (count) count.html(parseInt(count.html(), 10) - 1);
   },
   increment_record_count: function(scaffold) {
     // increment the last record count, firsts record count are in nested lists
     if (typeof(scaffold) == 'string') scaffold = '#' + scaffold;
-    scaffold = jQuery(scaffold)
+    scaffold = jQuery(scaffold);
     count = scaffold.find('span.active-scaffold-records').last();
     if (count) count.html(parseInt(count.html(), 10) + 1);
   },
@@ -465,7 +464,7 @@ var ActiveScaffold = {
     
   create_record_row: function(active_scaffold_id, html, options) {
     if (typeof(active_scaffold_id) == 'string') active_scaffold_id = '#' + active_scaffold_id;
-    tbody = jQuery(active_scaffold_id).find('tbody.records');
+    tbody = jQuery(active_scaffold_id).find('tbody.records').first();
     
     if (options.insert_at == 'top') {
       tbody.prepend(html);
@@ -618,7 +617,7 @@ var ActiveScaffold = {
     if (element.length == 0) {
       element = source.closest('form > ol.form');
     }
-    element = element.find('.' + options.field_class + ":first");
+    element = element.find('.' + options.field_class).first();
 
     if (element) {
       if (options.is_subform == false) {
@@ -861,7 +860,7 @@ ActiveScaffold.ActionLink = {
           new ActiveScaffold.Actions.Record(target, parent, loading_indicator);
         } else if (parent && parent.is('div')) {
           //table action
-          new ActiveScaffold.Actions.Table(parent.find('a.as_action'), parent.closest('div.active-scaffold').find('tbody.before-header'), parent.find('.loading-indicator'));
+          new ActiveScaffold.Actions.Table(parent.find('a.as_action'), parent.closest('div.active-scaffold').find('tbody.before-header').first(), parent.find('.loading-indicator').first());
         }
         element = jQuery(element);
       }
@@ -887,6 +886,7 @@ ActiveScaffold.ActionLink.Abstract = Class.extend({
   },
 
   open: function(event) {
+    this.tag.click();
   },
   
   insert: function(content) {
@@ -900,11 +900,6 @@ ActiveScaffold.ActionLink.Abstract = Class.extend({
     if (ActiveScaffold.config.scroll_on_close) ActiveScaffold.scroll_to(this.target);
   },
 
-  reload: function() {
-    this.close();
-    this.open();
-  },
-
   get_new_adapter_id: function() {
     var id = 'adapter_';
     var i = 0;
@@ -1053,5 +1048,10 @@ ActiveScaffold.ActionLink.Table = ActiveScaffold.ActionLink.Abstract.extend({
       throw 'Unknown position "' + this.position + '"'
     }
     ActiveScaffold.highlight(this.adapter.find('td').first().children());
-  }
+  },
+
+  reload: function() {
+    this.close();
+    this.open();
+  },
 });

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

@@ -784,6 +784,7 @@ ActiveScaffold.ActionLink.Abstract = Class.create({
   },
 
   open: function(event) {
+    this.tag.click();
   },
   
   insert: function(content) {
@@ -797,11 +798,6 @@ ActiveScaffold.ActionLink.Abstract = Class.create({
     if (ActiveScaffold.config.scroll_on_close) ActiveScaffold.scroll_to(this.target);
   },
 
-  reload: function() {
-    this.close();
-    this.open();
-  },
-
   get_new_adapter_id: function() {
     var id = 'adapter_';
     var i = 0;
@@ -946,7 +942,12 @@ ActiveScaffold.ActionLink.Table = Class.create(ActiveScaffold.ActionLink.Abstrac
       throw 'Unknown position "' + this.position + '"'
     }
     this.adapter.down('td').down().highlight();
-  }
+  },
+
+  reload: function() {
+    this.close();
+    this.open();
+  },
 });
 
 if (Ajax.InPlaceEditor) {

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

@@ -3,25 +3,27 @@ try {
 var action_link = ActiveScaffold.find_action_link('<%= form_selector%>');
 action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'messages'))%>');
 <% if controller.send :successful? %>
-  <% if render_parent? && controller.respond_to?(:render_component_into_view) %>
-    <% parent_rendered = controller.send(:render_component_into_view, render_parent_options) %>
-    <% if nested_singular_association? %>
-      action_link.close('<%= escape_javascript(parent_rendered)%>');
-    <% else %>
-      <% if render_parent_action == :row %>
+  <% if !active_scaffold_config.update.persistent %>
+    <% if render_parent? && controller.respond_to?(:render_component_into_view) %>
+      <% parent_rendered = controller.send(:render_component_into_view, render_parent_options) %>
+      <% if nested_singular_association? %>
         action_link.close('<%= escape_javascript(parent_rendered)%>');
-      <% elsif render_parent_action == :index %>
-        <%= escape_javascript(parent_rendered) %>
+      <% else %>
+        <% if render_parent_action == :row %>
+          action_link.close('<%= escape_javascript(parent_rendered)%>');
+        <% elsif render_parent_action == :index %>
+          <%= escape_javascript(parent_rendered) %>
+        <% end %>
+      <% end %>
+      <%#page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
+    <% elsif update_refresh_list? %>
+      ActiveScaffold.replace_html('<%= active_scaffold_content_id%>', '<%= escape_javascript(render(:partial => 'list', :layout => false))%>');
+    <% else %>
+      <% updated_row = render :partial => 'list_record', :locals => {:record => @record}%>
+      action_link.close('<%= escape_javascript(updated_row)%>');
+      <% if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
+        ActiveScaffold.replace('<%=active_scaffold_calculations_id%>', '<%=escape_javascript(render(:partial => 'list_calculations'))%>');
       <% end %>
-    <% end %>
-    <%#page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
-  <% elsif update_refresh_list? %>
-    ActiveScaffold.replace_html('<%= active_scaffold_content_id%>', '<%= escape_javascript(render(:partial => 'list', :layout => false))%>');
-   <% else %>
-    <% updated_row = render :partial => 'list_record', :locals => {:record => @record}%>
-    action_link.close('<%= escape_javascript(updated_row)%>');
-    <% if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
-      ActiveScaffold.replace('<%=active_scaffold_calculations_id%>', '<%=escape_javascript(render(:partial => 'list_calculations'))%>');
     <% end %>
   <% end %>
 <% else %>

data/lib/active_scaffold/actions/list.rb

@@ -30,9 +30,7 @@ module ActiveScaffold::Actions
       end
     end
     def list_respond_to_js
-      if params[:adapter]
-        render(:partial => 'list_with_header')
-      elsif embedded?
+      if params[:adapter] || embedded?
         render(:partial => 'list_with_header')
       else
         render :action => 'refresh_list', :formats => [:js]

data/lib/active_scaffold/actions/update.rb

@@ -47,9 +47,12 @@ module ActiveScaffold::Actions
       end
     end
     def update_respond_to_js
-      if successful? && update_refresh_list? && !render_parent?
-        do_search if respond_to? :do_search
-        do_list
+      if successful?
+        if update_refresh_list? && !render_parent?
+          do_search if respond_to? :do_search
+          do_list
+        end
+        flash.now[:info] = as_(:updated_model, :model => @record.to_label) if active_scaffold_config.update.persistent
       end
       render :action => 'on_update'
     end

data/lib/active_scaffold/config/update.rb

@@ -18,6 +18,10 @@ module ActiveScaffold::Config
     end
     @@link = ActiveScaffold::DataStructures::ActionLink.new('edit', :label => :edit, :type => :member, :security_method => :update_authorized?)
 
+    # whether the form stays open after an update or not
+    cattr_accessor :persistent
+    @@persistent = false
+
     # whether we should refresh list after update or not
     cattr_accessor :refresh_list
     @@refresh_list = false
@@ -28,6 +32,9 @@ module ActiveScaffold::Config
     attr_accessor :nested_links
     cattr_accessor :nested_links
     @@nested_links = false
+    
+    # whether the form stays open after an update or not
+    attr_accessor :persistent
 
     attr_writer :hide_nested_column
     def hide_nested_column

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -123,7 +123,7 @@ module ActiveScaffold
       
       def active_scaffold_checkbox_list(column, select_options, associated_ids, options)
         html = content_tag :ul, :class => "#{options[:class]} checkbox-list", :id => options[:id] do
-          content = "".html_safe
+          content = hidden_field_tag("#{options[:name]}[]", '')
           select_options.each_with_index do |option, i|
             label, id = option
             this_id = "#{options[:id]}_#{i}_id"

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 2
-    PATCH = 6
+    PATCH = 7
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 3
   - 2
-  - 6
-  version: 3.2.6
+  - 7
+  version: 3.2.7
 platform: ruby
 authors: 
 - Many, see README
@@ -15,10 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-03 00:00:00 Z
+date: 2012-05-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -27,12 +28,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  type: :development
-  requirement: *id001
+  version_requirements: *id001
   name: shoulda
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -43,12 +44,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  prerelease: false
-  type: :development
-  requirement: *id002
+  version_requirements: *id002
   name: bundler
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -57,12 +58,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  prerelease: false
-  type: :development
-  requirement: *id003
+  version_requirements: *id003
   name: rcov
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -73,10 +74,9 @@ dependencies:
         - 1
         - 3
         version: 3.1.3
-  prerelease: false
-  type: :runtime
-  requirement: *id004
+  version_requirements: *id004
   name: rails
+  prerelease: false
 description: Save time and headaches, and create a more easily maintainable set of pages, with ActiveScaffold. ActiveScaffold handles all your CRUD (create, read, update, delete) user interface needs, leaving you more time to focus on more challenging (and interesting!) problems.
 email: activescaffold@googlegroups.com
 executables: []
@@ -437,7 +437,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Rails 3.1 Version of activescaffold supporting prototype and jquery