active_scaffold 3.2.3 → 3.2.4

data/CHANGELOG

@@ -1,3 +1,14 @@
+= 3.2.4
+- don't break on custom SQL sorting (e.g. sorting with functions)
+- fix cancel inplace edit with jquery
+- fix nested scaffolds inside nested and embedded scaffolds
+- fix collapsed subgroups
+- fix inplace edit for checkboxes columns with true as default value
+- fix calendar date select bridge
+
+= 3.0.6 .. 3.2.3
+- many changes
+
 = 3.0.5
 
 - switch from explicit requires to autoloading

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

@@ -11,7 +11,7 @@ Authors:
 Project home:
 	http://code.google.com/p/jquery-in-place-editor/
 
-Patches with tests welcomed! For guidance see the tests at </spec/unit/spec.js>. To submit, attach them to the bug tracker.
+Patches with tests welcomed! For guidance see the tests </spec/unit/>. To submit, attach them to the bug tracker.
 
 License:
 This source file is subject to the BSD license bundled with this package.
@@ -19,6 +19,7 @@ Available online: {@link http://www.opensource.org/licenses/bsd-license.php}
 If you did not receive a copy of the license, and are unable to obtain it, 
 learn to use a search engine.
 
+Rev: 161
 */
 
 (function($){
@@ -26,9 +27,7 @@ learn to use a search engine.
 $.fn.editInPlace = function(options) {
 	
 	var settings = $.extend({}, $.fn.editInPlace.defaults, options);
-	
 	assertMandatorySettingsArePresent(settings);
-	
 	preloadImage(settings.saving_image);
 	
 	return this.each(function() {
@@ -57,7 +56,7 @@ $.fn.editInPlace.defaults = {
 	params:				"", // string: example: first_name=dave&last_name=hauenstein extra paramters sent via the post request to the server
 	field_type:			"text", // string: "text", "textarea", or "select", or "remote", or "clone";  The type of form field that will appear on instantiation
 	default_text:		"(Click here to add text)", // string: text to show up if the element that has this functionality is empty
-	use_html:			false, // boolean, set to true if the editor should use jQuery.fn.html() to extract the value to show from the dom node
+	use_html:			false, // boolean, set to true if the editor should use jQuery.fn.html() to extract the value to show from the dom node (keep in mind that IE will uppercase all tags, so use with caution)
 	textarea_rows:		10, // integer: set rows attribute of textarea, if field_type is set to textarea. Use CSS if possible though
 	textarea_cols:		25, // integer: set cols attribute of textarea, if field_type is set to textarea. Use CSS if possible though
 	select_text:		"Choose new value", // string: default text to show up in select box
@@ -179,14 +178,15 @@ $.extend(InlineEditor.prototype, {
 		if ( ! this.shouldOpenEditor(anEvent))
 			return;
 		
-		this.workAroundFirefoxBlurBug();
 		this.disconnectOpeningEvents();
 		this.removeHoverEffect();
 		this.removeInsertedDefaultTextIfNeccessary();
 		this.saveOriginalValue();
 		this.markEditorAsActive();
 		this.replaceContentWithEditor();
-		this.connectOpeningEventsToEditor();
+    this.setInitialValue();
+    this.workAroundMissingBlurBug();
+		this.connectClosingEventsToEditor();
 		this.triggerDelegateCall('didOpenEditInPlace');
 	},
 	
@@ -239,20 +239,16 @@ $.extend(InlineEditor.prototype, {
 			this.dom.text(aValue);
 	},
 	
-	workAroundFirefoxBlurBug: function() {
-		if ( ! $.browser.mozilla)
-			return;
-		
-		// TODO: Opera seems to also have this bug....
-		
-		// Firefox will forget to send a blur event to an input element when another one is
-		// created and selected programmatically. This means that if another inline editor is
-		// opened, existing inline editors will _not_ close if they are configured to submit when blurred.
-		// This is actually the first time I've written browser specific code for a browser different than IE! Wohoo!
+	workAroundMissingBlurBug: function() {
+    // Strangely, all browser will forget to send a blur event to an input element
+    // when another one is created and selected programmatically. (at least under some circumstances).
+    // This means that if another inline editor is opened, existing inline editors will _not_ close
+    // if they are configured to submit when blurred.
 		
 		// Using parents() instead document as base to workaround the fact that in the unittests
 		// the editor is not a child of window.document but of a document fragment
-		this.dom.parents(':last').find('.editInPlace-active :input').blur();
+    var ourInput = this.dom.find(':input');
+    this.dom.parents(':last').find('.editInPlace-active :input').not(ourInput).blur();
 	},
 	
 	replaceContentWithEditor: function() {
@@ -285,10 +281,20 @@ $.extend(InlineEditor.prototype, {
 		  editor = this.cloneEditor();
 		  return editor;
 		}
-		editor.val(this.triggerDelegateCall('willOpenEditInPlace', this.originalValue));
 		return editor;
 	},
 	
+  setInitialValue: function() {
+    var initialValue = this.triggerDelegateCall('willOpenEditInPlace', this.originalValue);
+    var editor = this.dom.find(':input');
+    editor.val(initialValue);
+    
+    // Workaround for select fields which don't contain the original value.
+    // Somehow the browsers don't like to select the instructional choice (disabled) in that case
+    if (editor.val() !== initialValue)
+      editor.val(''); // selects instructional choice
+  },
+  
 	createRemoteGeneratedEditor: function () {
 	  this.dom.html(this.settings.loading_text);
 	  return $($.ajax({
@@ -373,7 +379,6 @@ $.extend(InlineEditor.prototype, {
 			optionsArray = optionsArray.split(',');
 			
 		for (var i=0; i<optionsArray.length; i++) {
-			
 			var currentTextAndValue = optionsArray[i];
 			if ( ! $.isArray(currentTextAndValue))
 				currentTextAndValue = currentTextAndValue.split(':');
@@ -381,16 +386,14 @@ $.extend(InlineEditor.prototype, {
 			var value = trim(currentTextAndValue[1] || currentTextAndValue[0]);
 			var text = trim(currentTextAndValue[0]);
 			
-			var selected = (value == this.originalValue) ? 'selected="selected" ' : '';
-			var option = $('<option ' + selected + ' ></option>').val(value).text(text);
+      var option = $('<option>').val(value).text(text);
 			editor.append(option);
 		}
+    
 		return editor;
-		
 	},
 	
-	// REFACT: rename opening is not what it's about. Its about closing events really
-	connectOpeningEventsToEditor: function() {
+	connectClosingEventsToEditor: function() {
 		var that = this;
 		function cancelEditorAction(anEvent) {
 			that.handleCancelEditor(anEvent);
@@ -415,8 +418,8 @@ $.extend(InlineEditor.prototype, {
 			else
 				form.find(".inplace_field").blur(cancelEditorAction);
 			
-			// workaround for firefox bug where it won't submit on enter if no button is shown
-			if ($.browser.mozilla)
+			// workaround for msie & firefox bug where it won't submit on enter if no button is shown
+			if ($.browser.mozilla || $.browser.msie)
 				this.bindSubmitOnEnterInInput();
 		}
 		
@@ -460,9 +463,6 @@ $.extend(InlineEditor.prototype, {
 		enteredText = this.triggerDelegateCall('willCloseEditInPlace', enteredText);
 		
 		this.restoreOriginalValue();
-		if (hasContent(enteredText) 
-			&& ! this.isDisabledDefaultSelectChoice() && !editor.is('select'))
-			this.setClosedEditorContent(enteredText);
 		this.reinit();
 	},
 	
@@ -609,7 +609,7 @@ $.extend(InlineEditor.prototype, {
 		if ( ! aCallback)
 			return; // callback wasn't specified after all
 		
-		var callbackArguments = Array.prototype.splice.call(arguments, 1);
+		var callbackArguments = Array.prototype.slice.call(arguments, 1);
 		return aCallback.apply(this.dom[0], callbackArguments);
 	},
 	

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

@@ -1,6 +1,6 @@
 <% subsection_id ||= nil %>
 <% show_unauthorized_columns = active_scaffold_config.send(form_action).show_unauthorized_columns %>
-<ol class="form" <%= "id=#{subsection_id}" unless subsection_id.nil? %> <%= "style=\"display: none;\"" if columns.collapsed %>>
+<ol class="form" <%= "id=#{subsection_id}" unless subsection_id.nil? %> <%= "style=\"display: none;\"".html_safe if columns.collapsed %>>
   <% columns.each :for => @record, :crud_type => (:read if show_unauthorized_columns) do |column| %>
   <% authorized = show_unauthorized_columns ? @record.authorized_for?(:crud_type => form_action, :column => column.name) : true %>
   <% renders_as = column_renders_as(column) %>

data/lib/active_scaffold/actions/update.rb

@@ -107,7 +107,13 @@ module ActiveScaffold::Actions
       @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]).null
+        unless @record.column_for_attribute(params[:column]).nil? || @record.column_for_attribute(params[:column]).null
+          if @record.column_for_attribute(params[:column]).default == true
+            params[:value] ||= false
+          else
+            params[:value] ||= @record.column_for_attribute(params[:column]).default
+          end
+        end
         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?

data/lib/active_scaffold/data_structures/sorting.rb

@@ -32,9 +32,8 @@ module ActiveScaffold::DataStructures
       direction ||= 'ASC'
       direction = direction.to_s.upcase
       column = get_column(column_name)
-      raise ArgumentError, "Could not find column #{column_name}" if column.nil?
       raise ArgumentError, "Sorting direction unknown" unless [:ASC, :DESC].include? direction.to_sym
-      @clauses << [column, direction.untaint] if column.sortable?
+      @clauses << [column, direction.untaint] if column and column.sortable?
       raise ArgumentError, "Can't mix :method- and :sql-based sorting" if mixed_sorting?
     end
 

data/lib/active_scaffold/extensions/action_controller_rendering.rb

@@ -2,7 +2,7 @@
 module ActionController #:nodoc:
   class Base
     def render_with_active_scaffold(*args, &block)
-      if self.class.uses_active_scaffold? and params[:adapter] and @rendering_adapter.nil?
+      if self.class.uses_active_scaffold? and params[:adapter] and @rendering_adapter.nil? and request.xhr?
         @rendering_adapter = true # recursion control
         # if we need an adapter, then we render the actual stuff to a string and insert it into the adapter template
         opts = args.blank? ? Hash.new : args.first

data/lib/active_scaffold/helpers/controller_helpers.rb

@@ -30,12 +30,12 @@ module ActiveScaffold
           parameters = {}
           if params[:parent_controller]
             parameters[:controller] = params[:parent_controller]
-            #parameters[:eid] = params[:parent_controller]
+            #parameters[:eid] = params[:parent_controller] # not neeeded anymore?
           end
           parameters.merge! nested.to_params if nested?
           if params[:parent_sti]
             parameters[:controller] = params[:parent_sti]
-            #parameters[:eid] = nil
+            #parameters[:eid] = nil # not neeeded anymore?
           end
           parameters[:parent_column] = nil
           parameters[:parent_id] = nil

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -190,9 +190,12 @@ module ActiveScaffold
         if column && column.association 
           url_options[column.association.active_record.name.foreign_key.to_sym] = url_options.delete(:id)
           url_options[:id] = record.send(column.association.name).id if column.singular_association? && record.send(column.association.name).present?
+          url_options[:eid] = nil # needed for nested scaffolds open from an embedded scaffold
         elsif link.parameters && link.parameters[:named_scope]
           url_options[active_scaffold_config.model.name.foreign_key.to_sym] = url_options.delete(:id)
+          url_options[:eid] = nil # needed for nested scaffolds open from an embedded scaffold
         end
+        nested.constrained_fields.each { |field| url_options.delete field } if nested?
       end
 
       def url_options_for_sti_link(column, record, link, url_options, options = {})

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 2
-    PATCH = 3
+    PATCH = 4
 
     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: 9
+  hash: 7
   prerelease: 
   segments: 
   - 3
   - 2
-  - 3
-  version: 3.2.3
+  - 4
+  version: 3.2.4
 platform: ruby
 authors: 
 - Many, see README
@@ -15,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-30 00:00:00 Z
+date: 2012-04-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -28,12 +27,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id001
-  name: shoulda
+  type: :development
   prerelease: false
+  requirement: *id001
+  name: shoulda
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -44,12 +43,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id002
-  name: bundler
+  type: :development
   prerelease: false
+  requirement: *id002
+  name: bundler
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -58,12 +57,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id003
-  name: rcov
+  type: :development
   prerelease: false
+  requirement: *id003
+  name: rcov
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -74,9 +73,10 @@ dependencies:
         - 1
         - 3
         version: 3.1.3
-  version_requirements: *id004
-  name: rails
+  type: :runtime
   prerelease: false
+  requirement: *id004
+  name: rails
 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.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Rails 3.1 Version of activescaffold supporting prototype and jquery