active_scaffold 3.3.0.rc → 3.3.0.rc2

data/CHANGELOG

@@ -15,8 +15,25 @@
 - Fix calculations using field_search with has_many includes
 - Add support to ActiveScaffold.create_record_row to insert after or before of an element
 - Add support for dynamic action group
-
-= 3.2.17 (not released yet)
+- Improve parsing of datetimes
+- Add support for lists filtered by id (one-item lists)
+- Fix update_columns with sending whole big forms
+- Improve update_columns on subforms
+- Support to override ActiveScaffold.remove so effects can be added on page elements deletion
+- Add support for conversion methods in controller, so form_uis can define how to convert params to values
+- Avoid sorting by contraint columns
+- Cosmetic fixes and improvements
+- Fix multipart persistent update form
+- Support jquery 1.9 (jquery-rails 2.2.0 gem)
+
+= 3.2.19 (not released yet)
+- Avoid crashing when between is chosen and from or to is not filled
+
+= 3.2.18
+- Fix add existing record with record_select
+- Disable link for polymorphic associations in 3.2.x, it doesn't work
+
+= 3.2.17
 - fix constraints for columns with multiple columns in search_sql
 - remove unauthorized collection links
 - copy parameters and html_options on cloning action link

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

@@ -1,4 +1,10 @@
 jQuery(document).ready(function($) {
+  if (jQuery().jquery < '1.8.0') {
+    var error = 'ActiveScaffold requires jquery 1.8.0 or greater, please use jquery-rails 2.1.x gem or greater';
+    if (typeof console != 'undefined') console.error(error);
+    else alert(error);
+  }
+
   jQuery(document).click(function(event) {
     jQuery('.action_group.dyn ul').remove();
   });
@@ -24,7 +30,7 @@ jQuery(document).ready(function($) {
   jQuery(document).on('ajax:error', 'form.as_form', function(event, xhr, status, error) {
     var as_div = jQuery(this).closest("div.active-scaffold");
     if (as_div.length) {
-      ActiveScaffold.report_500_response(as_div);
+      ActiveScaffold.report_500_response(as_div, xhr);
     }
   });
   jQuery(document).on('submit', 'form.as_form:not([data-remote])', function(event) {
@@ -69,7 +75,7 @@ jQuery(document).ready(function($) {
   jQuery(document).on('ajax:error', 'a.as_action', function(event, xhr, status, error) {
     var action_link = ActiveScaffold.ActionLink.get(jQuery(this));
     if (action_link) {
-      ActiveScaffold.report_500_response(action_link.scaffold_id());
+      ActiveScaffold.report_500_response(action_link.scaffold_id(), xhr);
       action_link.enable();
     }
     return true;
@@ -103,7 +109,7 @@ jQuery(document).ready(function($) {
   jQuery(document).on('ajax:error', 'a.as_cancel', function(event, xhr, status, error) {
     var action_link = ActiveScaffold.find_action_link(jQuery(this));
     if (action_link) {
-      ActiveScaffold.report_500_response(action_link.scaffold_id());
+      ActiveScaffold.report_500_response(action_link.scaffold_id(), xhr);
     }
     return true;
   });
@@ -116,10 +122,10 @@ jQuery(document).ready(function($) {
   });
   jQuery(document).on('ajax:error', 'a.as_sort', function(event, xhr, status, error) {
     var as_scaffold = jQuery(this).closest('.active-scaffold');
-    ActiveScaffold.report_500_response(as_scaffold);
+    ActiveScaffold.report_500_response(as_scaffold, xhr);
     return true;
   });
-  jQuery(document).on('hover', 'td.in_place_editor_field', function(event) {
+  jQuery(document).on('mouseenter mouseleave', 'td.in_place_editor_field', function(event) {
     var td = jQuery(this), span = td.find('span.in_place_editor_field');
     if (event.type == 'mouseenter') {
       if (td.hasClass('empty') || typeof(span.data('editInPlace')) === 'undefined') td.find('span').addClass("hover");
@@ -145,7 +151,7 @@ jQuery(document).ready(function($) {
   });
   jQuery(document).on('ajax:error', 'a.as_paginate', function(event, xhr, status, error) {
     var as_scaffold = jQuery(this).closest('.active-scaffold');
-    ActiveScaffold.report_500_response(as_scaffold);
+    ActiveScaffold.report_500_response(as_scaffold, xhr);
     return true;
   });
   jQuery(document).on('ajax:complete', 'a.as_paginate', function(event) {
@@ -153,7 +159,9 @@ jQuery(document).ready(function($) {
     return true;
   });
   jQuery(document).on('ajax:before', 'a.as_add_existing, a.as_replace_existing', function(event) {
-    var id = jQuery(this).prev().val();
+    var prev = jQuery(this).prev();
+    if (!prev.is(':input')) prev = prev.find(':input');
+    var id = prev.val();
     if (id) {
       if (!jQuery(this).data('href')) jQuery(this).data('href', jQuery(this).attr('href'));
       jQuery(this).attr('href', jQuery(this).data('href').replace('--ID--', id));
@@ -428,7 +436,8 @@ var ActiveScaffold = {
   replace: function(element, html) {
     if (typeof(element) == 'string') element = '#' + element; 
     element = jQuery(element);
-    var new_element = jQuery(html);
+    var new_element = typeof(html) == 'string' ? jQuery.parseHTML(html.trim()) : html;
+    new_element = jQuery(new_element);
     element.replaceWith(new_element);
     new_element.trigger('as:element_updated');
     return new_element;
@@ -650,7 +659,8 @@ var ActiveScaffold = {
     var initial_label = (options.default_visible === true) ? options.hide_label : options.show_label;
     
     toggler.append(' (<a class="visibility-toggle" href="#">' + initial_label + '</a>)');
-    toggler.children('a').click(function() {
+    toggler.children('a').click(function(e) {
+      e.preventDefault();
       toggable.toggle(); 
       jQuery(this).html((toggable.is(':hidden')) ? options.show_label : options.hide_label);
       return false;
@@ -682,7 +692,7 @@ var ActiveScaffold = {
   render_form_field: function(source, content, options) {
     if (typeof(source) == 'string') source = '#' + source;
     var source = jQuery(source);
-    var element = source.closest('.association-record').nextUntil('.association-record').andSelf();
+    var element = source.closest('.association-record').nextUntil('.association-record').addBack();
     if (element.length == 0) {
       element = source.closest('form > ol.form');
     }
@@ -701,7 +711,7 @@ var ActiveScaffold = {
     jQuery.ajax({
       url: edit_associated_url.split('--ID--').join(id),
       error: function(xhr, textStatus, errorThrown){
-        ActiveScaffold.report_500_response(active_scaffold_id)
+        ActiveScaffold.report_500_response(active_scaffold_id, xhr)
       }
     });
   },
@@ -712,24 +722,13 @@ var ActiveScaffold = {
     var element = jQuery(element);
     if (options.include_checkboxes) {
       var mark_checkboxes = jQuery('#' + element.attr('id') + ' > tr.record td.as_marked-column input[type="checkbox"]');
-      mark_checkboxes.each(function (index) {
-        var item = jQuery(this);
-        if(options.checked) {
-          item.attr('checked', 'checked');
-        } else {
-          item.removeAttr('checked');
-        }
-        item.attr('value', ('' + !options.checked));
-      });
+      mark_checkboxes.prop('checked', !!options.checked);
+      mark_checkboxes.val('' + !options.checked);
     }
     if(options.include_mark_all) {
       var mark_all_checkbox = element.prevAll('thead').find('th.as_marked-column_heading span input[type="checkbox"]');
-      if(options.checked) {
-        mark_all_checkbox.attr('checked', 'checked');
-      } else {
-        mark_all_checkbox.removeAttr('checked');
-      }
-      mark_all_checkbox.attr('value', ('' + !options.checked));
+      mark_all_checkbox.prop('checked', !!options.checked);
+      mark_all_checkbox.val('' + !options.checked);
     }
   },
 
@@ -860,7 +859,7 @@ var ActiveScaffold = {
       error: function (xhr, status, error) {
         var as_div = element.closest("div.active-scaffold");
         if (as_div) {
-          ActiveScaffold.report_500_response(as_div);
+          ActiveScaffold.report_500_response(as_div, xhr);
         }
       }
     });

data/app/assets/javascripts/jquery/date_picker_bridge.js.erb

@@ -1,24 +1,22 @@
 <%= ActiveScaffold::Bridges[:date_picker].localization %>
-
-jQuery(document).ready(function() {
-  jQuery('input.date_picker').live('focus', function(event) {
-    var date_picker = jQuery(this);
-    if (typeof(date_picker.datepicker) == 'function') {
-      if (!date_picker.hasClass('hasDatepicker')) {
-        date_picker.datepicker();
-        date_picker.trigger('focus');
-      }
-    }
-    return true;
-  });
-  jQuery('input.datetime_picker').live('focus', function(event) {
-    var date_picker = jQuery(this);
-    if (typeof(date_picker.datetimepicker) == 'function') {
-      if (!date_picker.hasClass('hasDatepicker')) {
-        date_picker.datetimepicker();
-        date_picker.trigger('focus');
-      }
+jQuery(document).on("focus", "input.date_picker", function(){
+  var date_picker = jQuery(this);
+  if (typeof(date_picker.datepicker) == 'function') {
+    if (!date_picker.hasClass('hasDatepicker')) {
+      date_picker.datepicker();
+      date_picker.trigger('focus');
     }
-    return true;
-  });
+  }
+  return true;
 });
+
+jQuery(document).on("focus", "input.datetime_picker", function(){
+  var date_picker = jQuery(this);
+  if (typeof(date_picker.datetimepicker) == 'function') {
+    if (!date_picker.hasClass('hasDatepicker')) {
+      date_picker.datetimepicker();
+      date_picker.trigger('focus');
+    }
+  }
+  return true;
+});

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

@@ -18,8 +18,7 @@ jQuery.fn.draggable_lists = function() {
     drop: function(event, ui) {
       jQuery(this).append(ui.draggable);
       var input = jQuery('input:checkbox', ui.draggable);
-      if (jQuery(this).hasClass('selected')) input.attr('checked', 'checked');
-      else input.removeAttr('checked');
+      input.prop('checked', jQuery(this).hasClass('selected'));
       ui.draggable.css({left: '0px', top: '0px'});
     }
   });

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

@@ -420,8 +420,10 @@ $.extend(InlineEditor.prototype, {
 				form.find(".inplace_field").blur(cancelEditorAction);
 			
 			// workaround for msie & firefox bug where it won't submit on enter if no button is shown
+      /* TODO find a way to restore it without $.browser if it doesn't work
 			if ($.browser.mozilla || $.browser.msie)
 				this.bindSubmitOnEnterInInput();
+      */
 		}
 		
 		form.keyup(function(anEvent) {
@@ -433,8 +435,10 @@ $.extend(InlineEditor.prototype, {
 		
 		// workaround for webkit nightlies where they won't submit at all on enter
 		// REFACT: find a way to just target the nightlies
+    /* TODO find a way to restore it without $.browser if it doesn't work
 		if ($.browser.safari)
 			this.bindSubmitOnEnterInInput();
+    */
 		
 		
 		form.submit(saveEditorAction);

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

@@ -244,9 +244,13 @@ document.observe("dom:loaded", function() {
   });
   document.on('ajax:before', 'a.as_add_existing, a.as_replace_existing', function(event) {
     var button = event.findElement();
-    var url =  button.readAttribute('href').sub('--ID--', button.previous().getValue());
-    event.memo.url = url;
-    return true;
+    var prev = button.previous();
+    if (!prev.match('input,select')) prev = prev.down('input,select');
+    var id = prev.getValue();
+    if (id) {
+      event.memo.url = button.readAttribute('href').sub('--ID--', id);
+      return true;
+    } else return false;
   });
   document.on('change', 'input.update_form, textarea.update_form, select.update_form', function(event) {
     var element = event.findElement();
@@ -599,6 +603,7 @@ var ActiveScaffold = {
     toggler.insert(' (<a class="visibility-toggle" href="#">' + initial_label + '</a>)');
     toggler.firstDescendant().observe('click', function(event) {
       var element = event.element();
+      event.stop();
       toggable.toggle(); 
       element.innerHTML = (toggable.style.display == 'none') ? options.show_label : options.hide_label;
       return false;

data/app/views/active_scaffold_overrides/_form.html.erb

@@ -6,8 +6,8 @@
 <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| %>
   <% column_css_class = column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc) %>
-  <% authorized = show_unauthorized_columns ? @record.authorized_for?(:crud_type => form_action, :column => column.name) : true %>
   <% renders_as = column_renders_as(column) %>
+  <% authorized = show_unauthorized_columns ? @record.authorized_for?(:crud_type => form_action, :column => column.name) : true unless renders_as == :subsection %>
   <% if renders_as == :subsection -%>
     <% subsection_id = sub_section_id(:sub_section => column.label) %>
   <li class="sub-section <%= column_css_class %>">

data/app/views/active_scaffold_overrides/_form_association_footer.html.erb

@@ -34,7 +34,7 @@ add_new_url = params_for(:action => 'edit_associated', :child_association => col
 
     <% if show_add_existing -%>
       <% if remote_controller and remote_controller.respond_to? :uses_record_select? and remote_controller.uses_record_select? -%>
-        <%= link_to_record_select as_(:add_existing), remote_controller.controller_path, :onselect => "ActiveScaffold.record_select_onselect(#{edit_associated_url.to_json}, #{active_scaffold_id.to_json}, id);" -%>
+        <%= link_to_record_select as_(:add_existing), remote_controller.controller_path, :onselect => "ActiveScaffold.record_select_onselect(#{url_for(edit_associated_url).to_json}, #{active_scaffold_id.to_json}, id);" -%>
       <% else -%>
         <% select_options = options_from_collection_for_select(sorted_association_options_find(column.association), :id, :to_label)
            add_existing_id = "#{sub_form_id(:association => column.name)}-add-existing"

data/app/views/active_scaffold_overrides/_form_attribute.html.erb

@@ -1,8 +1,12 @@
 <%
   scope ||= nil
   column_options = active_scaffold_input_options(column, scope)
+  attributes = field_attributes(column, @record)
+  if local_assigns[:col_class].present?
+    attributes[:class] = "#{attributes[:class]} #{col_class}"
+  end
 %>
-<dl<%= " class=\"#{col_class}\"".html_safe if local_assigns[:col_class].present? %>>
+<%= tag :dl, attributes, true %>
   <dt>
     <label for="<%= column_options[:id] %>"><%= column.label %></label>
   </dt>

data/app/views/active_scaffold_overrides/_horizontal_subform_header.html.erb

@@ -6,7 +6,12 @@
       next unless in_subform?(column, parent_record)
       hidden = column_renders_as(column) == :hidden
       -%>
-      <th class="<%= "#{column.name}-column #{'required' if column.required?} #{'hidden' if hidden}" %>"><label><%= column.label unless hidden %></label></th>
+      <th class="<%= "#{column.name}-column #{'required' if column.required?} #{'hidden' if hidden}" %>">
+        <label><%= column.label unless hidden %></label>
+        <% if column.description.present? -%>
+          <span class="description"><%= column.description %></span>
+        <% end -%>
+      </th>
     <% end -%>
   </tr>
 </thead>

data/app/views/active_scaffold_overrides/_list_record.html.erb

@@ -5,7 +5,6 @@ tr_class = cycle("", "even-record") + ' ' + list_row_class(record)
 action_links ||= active_scaffold_config.action_links.member
 data_refresh ||= url_for(params_for(:action => :row, :id => '--ID--', :_method => :get))
 -%>
-
 <tr class="record <%= tr_class %>" id="<%= element_row_id(:action => :list, :id => record.id) %>" data-refresh="<%= data_refresh.sub('--ID--', record.id.to_s).html_safe %>">
   <% columns.each do |column| %>
     <% authorized = record.authorized_for?(:crud_type => :read, :column => column.name) -%>

data/app/views/active_scaffold_overrides/_vertical_subform.html.erb

@@ -1,8 +1,6 @@
 <div id="<%= sub_form_list_id(:association => column.name) %>">
   <% associated.each_index do |index| %>
-  <div class="sub-form-record">
   <% @record = associated[index] -%>
   <%= render :partial => 'form_association_record', :locals => {:scope => column_scope(column, scope), :parent_record => parent_record, :column => column, :locked => show_blank_record && @record.new_record? && @record == associated.last, :index => index} %>
-  </div>
   <% end -%>
 </div>

data/app/views/active_scaffold_overrides/destroy.js.erb

@@ -21,6 +21,6 @@
     <%= render :partial => 'update_calculations', :formats => [:js] %>
   <% end %>
 <% else %>
-  <% flash[:error] = active_scaffold_error_messages_for(@record, :object_name => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :header_message => '', :message => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :container_tag => nil, :list_type => :br) %>
+  <% flash[:error] = active_scaffold_error_messages_for(@record, :object_name => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :header_message => '', :message => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :container_tag => nil, :list_type => :br) if @record.errors.present? %>
 <% end %>
 <%= render :partial => 'update_messages', :locals => {:messages_id => messages_id} %>

data/app/views/active_scaffold_overrides/on_action_update.js.erb

@@ -16,7 +16,7 @@
     <%= render :partial => 'refresh_list' %>
   <% end %>
 <% else %>
-  <% flash[:error] = active_scaffold_error_messages_for(@record, :object_name => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :header_message => '', :message => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :container_tag => nil, :list_type => :br) %>
+  <% flash[:error] = active_scaffold_error_messages_for(@record, :object_name => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :header_message => '', :message => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :container_tag => nil, :list_type => :br) if @record.errors.present? %>
   ActiveScaffold.replace_html('<%= active_scaffold_messages_id %>','<%= escape_javascript(render(:partial => 'messages')) %>');
   ActiveScaffold.scroll_to('<%= active_scaffold_messages_id %>', true);
 <% end %>

data/app/views/active_scaffold_overrides/on_update.js.erb

@@ -1,5 +1,5 @@
 try {
-<% form_selector = "#{element_form_id(:action => :update, :id => @record.id)}" %>
+<% form_selector = "#{element_form_id(:action => :update, :id => @record.try(:id) || params[:id])}" %>
 var action_link = ActiveScaffold.find_action_link('<%= form_selector %>');
 action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'messages')) %>');
 <% if controller.send :successful? %>
@@ -8,6 +8,7 @@ action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'mes
     ActiveScaffold.update_row('<%= row_selector %>', '<%= escape_javascript(render(:partial => 'list_record', :locals => {:record => @record})) %>');
     action_link.target = $('#<%= row_selector %>');
     <%= render :partial => 'update_calculations', :formats => [:js] %>
+    <%= "ActiveScaffold.enable_form('#{form_selector}');" if params[:iframe] == 'true' %>
   <% else %>
     <% if render_parent? %>
       <% if nested_singular_association? || render_parent_action == :row %>
@@ -18,7 +19,12 @@ action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'mes
     <% elsif update_refresh_list? %>
       <%= render :partial => 'refresh_list' %>
     <% else %>
+      <% if @record %>
       action_link.close('<%= escape_javascript(render(:partial => 'list_record', :locals => {:record => @record})) %>');
+      <% else %>
+      action_link.close();
+      ActiveScaffold.delete_record_row('<%= element_row_id(:action => :list, :id => params[:id]) %>');
+      <% end %>
       <%= render :partial => 'update_calculations', :formats => [:js] %>
     <% end %>
   <% end %>

data/app/views/active_scaffold_overrides/render_field_inplace.html.erb

@@ -0,0 +1 @@
+<%= active_scaffold_input_for(active_scaffold_config.columns[@column.name]) %>

data/app/views/active_scaffold_overrides/row.js.erb

@@ -1,2 +1,2 @@
-ActiveScaffold.update_row('<%= element_row_id(:action => :list) %>', '<%= escape_javascript render('row', :record => @record) %>');
+ActiveScaffold.update_row('<%= element_row_id(:action => :list) %>', '<%= escape_javascript render('list_record', :record => @record) %>');
 <%= render :partial => 'update_calculations', :formats => [:js] %>

data/lib/active_scaffold/actions/core.rb

@@ -28,19 +28,20 @@ module ActiveScaffold::Actions
     end
 
     def render_field_for_inplace_editing
+      @column = active_scaffold_config.columns[params[:update_column]]
       @record = find_if_allowed(params[:id], :crud_type => :update, :column => params[:update_column])
-      render :inline => "<%= active_scaffold_input_for(active_scaffold_config.columns[params[:update_column].to_sym]) %>"
+      render :action => 'render_field_inplace', :layout => false
     end
 
     def render_field_for_update_columns
-      column = active_scaffold_config.columns[params.delete(:column)]
-      unless column.nil?
+      @column = active_scaffold_config.columns[params.delete(:column)]
+      unless @column.nil?
         @source_id = params.delete(:source_id)
-        @columns = column.update_columns
+        @columns = @column.update_columns
         @scope = params.delete(:scope)
         @main_columns = active_scaffold_config.send(@scope ? :subform : (params[:id] ? :update : :create)).columns
         
-        if column.send_form_on_update_column
+        if @column.send_form_on_update_column
           if @scope
             hash = @scope.gsub('[','').split(']').inject(params[:record]) do |hash, index|
               hash[index]
@@ -54,11 +55,11 @@ module ActiveScaffold::Actions
           @record = update_record_from_params(@record, @main_columns, hash)
         else
           @record = new_model
-          value = column_value_from_param_value(@record, column, params.delete(:value))
-          @record.send "#{column.name}=", value
+          value = column_value_from_param_value(@record, @column, params.delete(:value))
+          @record.send "#{@column.name}=", value
         end
         
-        after_render_field(@record, column)
+        after_render_field(@record, @column)
       end
     end
     
@@ -70,11 +71,7 @@ module ActiveScaffold::Actions
     end
 
     def clear_flashes
-      if request.xhr?
-        flash.keys.each do |flash_key|
-          flash[flash_key] = nil
-        end
-      end
+      flash.clear if request.xhr?
     end
 
     def each_marked_record(&block)

data/lib/active_scaffold/actions/update.rb

@@ -52,7 +52,8 @@ module ActiveScaffold::Actions
           if update_refresh_list?
             do_refresh_list
           else
-            get_row
+            # get_row so associations are cached like in list action
+            @record = get_row rescue nil # if record doesn't fullfil current conditions remove it from list
           end
         end
         flash.now[:info] = as_(:updated_model, :model => @record.to_label) if active_scaffold_config.update.persistent

data/lib/active_scaffold/attribute_params.rb

@@ -91,12 +91,27 @@ module ActiveScaffold
     
     def column_value_from_param_value(parent_record, column, value)
       # convert the value, possibly by instantiating associated objects
-      if value.is_a?(Hash)
+      form_ui = column.form_ui || column.column.try(:type)
+      if form_ui && self.respond_to?("column_value_for_#{form_ui}_type")
+        self.send("column_value_for_#{form_ui}_type", parent_record, column, value)
+      elsif value.is_a?(Hash)
         column_value_from_param_hash_value(parent_record, column, value)
       else
         column_value_from_param_simple_value(parent_record, column, value)
       end
     end
+    
+    def datetime_conversion_for_value(column)
+      if column.column
+        column.column.type == :date ? :to_date : :to_time
+      else
+        :to_time
+      end
+    end
+    
+    def column_value_for_datetime_type(parent_record, column, value)
+      self.class.condition_value_for_datetime(column, value, self.class.datetime_conversion_for_condition(column))
+    end
 
     def column_value_from_param_simple_value(parent_record, column, value)
       if column.singular_association?

data/lib/active_scaffold/bridges/calendar_date_select/as_cds_bridge.rb

@@ -34,7 +34,7 @@ module ActiveScaffold
       module SearchColumnHelpers
         def active_scaffold_search_date_bridge_calendar_control(column, options, current_search, name)
           if current_search.is_a? Hash
-            value = controller.class.condition_value_for_datetime(current_search[name], column.column.type == :date ? :to_date : :to_time)
+            value = controller.class.condition_value_for_datetime(column, current_search[name], column.column.type == :date ? :to_date : :to_time)
           else
             value = current_search
           end

data/lib/active_scaffold/bridges/chosen/helpers.rb

@@ -20,7 +20,7 @@ class ActiveScaffold::Bridges::Chosen
           html_options[:name] = "#{html_options[:name]}[]" if html_options[:multiple] == true && !html_options[:name].to_s.ends_with?("[]")
 
           if optgroup = options.delete(:optgroup)
-            select(:record, column.name, grouped_options_for_select(column, select_options, optgroup), options, html_options)
+            select(:record, column.name, active_scaffold_grouped_options(column, select_options, optgroup), options, html_options)
           else
             collection_select(:record, column.name, select_options, :id, :to_label, options, html_options)
           end

data/lib/active_scaffold/bridges/date_picker/ext.rb

@@ -61,3 +61,15 @@ ActiveScaffold::Finder::ClassMethods.module_eval do
   alias_method :condition_for_date_picker_type, :condition_for_date_bridge_type
   alias_method :condition_for_datetime_picker_type, :condition_for_date_picker_type
 end
+ActiveScaffold::AttributeParams.module_eval do
+  def datetime_conversion_for_value_with_datepicker(column)
+    if column.form_ui == :date_picker
+      :to_date
+    else
+      datetime_conversion_for_value_without_datepicker(column)
+    end
+  end
+  alias_method_chain :datetime_conversion_for_value, :datepicker
+  alias_method :column_value_for_date_picker_type, :column_value_for_datetime_type
+  alias_method :column_value_for_datetime_picker_type, :column_value_for_datetime_type
+end

data/lib/active_scaffold/bridges/date_picker/helper.rb

@@ -151,7 +151,7 @@ module ActiveScaffold::Bridges
       module SearchColumnHelpers
         def active_scaffold_search_date_bridge_calendar_control(column, options, current_search, name)
           if current_search.is_a? Hash
-            value = controller.class.condition_value_for_datetime(current_search[name], column.search_ui == :date_picker ? :to_date : :to_time)
+            value = controller.class.condition_value_for_datetime(column, current_search[name], column.search_ui == :date_picker ? :to_date : :to_time)
           else
             value = current_search
           end
@@ -169,7 +169,7 @@ module ActiveScaffold::Bridges
         def active_scaffold_input_date_picker(column, options)
           options = active_scaffold_input_text_options(options.merge(column.options))
           options[:class] << " #{column.form_ui.to_s}"
-          value = controller.class.condition_value_for_datetime(@record.send(column.name), column.form_ui == :date_picker ? :to_date : :to_time)
+          value = controller.class.condition_value_for_datetime(column, @record.send(column.name), column.form_ui == :date_picker ? :to_date : :to_time)
           format = options.delete(:format) || (column.form_ui == :date_picker ? :default : :picker)
           datepicker_format_options(column, format, options)
           options[:value] = (value ? l(value, :format => format) : nil)

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

@@ -114,7 +114,7 @@ module ActiveScaffold
                 unless operator.nil?
                   ["%{search_sql} #{value[:opt]} ?", from_value.to_s(:db)] unless from_value.nil?
                 else
-                  ["%{search_sql} BETWEEN ? AND ?", from_value.to_s(:db), to_value.to_s(:db)] unless from_value.nil? && to_value.nil?  
+                  ["%{search_sql} BETWEEN ? AND ?", from_value.to_s(:db), to_value.to_s(:db)] unless from_value.nil? || to_value.nil?
                 end
               end
             end
@@ -127,7 +127,7 @@ module ActiveScaffold
               when 'PAST', 'FUTURE'
                 date_bridge_from_to_for_trend(column, value).collect(&conversion)
               else
-                ['from', 'to'].collect { |field| condition_value_for_datetime(value[field], conversion)}
+                ['from', 'to'].collect { |field| condition_value_for_datetime(column, value[field], conversion)}
               end
             end
 
@@ -206,4 +206,4 @@ ActiveScaffold::Finder.const_set('TimeUnits', ["SECONDS", "MINUTES", "HOURS"])
 ActiveScaffold::Finder.const_set('DateRanges', ["TODAY", "YESTERDAY", "TOMORROW",
                                                 "THIS_WEEK", "PREV_WEEK", "NEXT_WEEK",
                                                 "THIS_MONTH", "PREV_MONTH", "NEXT_MONTH",
-                                                "THIS_YEAR", "PREV_YEAR", "NEXT_YEAR"])
+                                                "THIS_YEAR", "PREV_YEAR", "NEXT_YEAR"])

data/lib/active_scaffold/config/list.rb

@@ -230,6 +230,10 @@ module ActiveScaffold::Config
             @sorting = sorting
           else
             @sorting = default_sorting
+            if @conf.columns.constraint_columns.present?
+              @sorting = @sorting.clone
+              @sorting.constraint_columns = @conf.columns.constraint_columns
+            end
           end
         end
         @sorting

data/lib/active_scaffold/data_structures/action_links.rb

@@ -49,7 +49,7 @@ module ActiveScaffold::DataStructures
           collected = item[val]
           links << collected unless collected.nil?
         else
-          links << item if item.action == val.to_s
+          links << item if item.action.to_s == val.to_s
         end
       end
       links.first

data/lib/active_scaffold/data_structures/sorting.rb

@@ -3,9 +3,12 @@ module ActiveScaffold::DataStructures
   class Sorting
     include Enumerable
 
+    attr_accessor :constraint_columns
+
     def initialize(columns)
       @columns = columns
       @clauses = []
+      @constraint_columns = []
     end
     
     def set_default_sorting(model)
@@ -91,6 +94,7 @@ module ActiveScaffold::DataStructures
       # unless the sorting is by method, create the sql string
       order = []
       each do |sort_column, sort_direction|
+        next if constraint_columns.include? sort_column.name
         sql = sort_column.sort[:sql]
         next if sql.nil? or sql.empty?
 

data/lib/active_scaffold/extensions/action_view_rendering.rb

@@ -70,7 +70,11 @@ module ActionView::Helpers #:nodoc:
         end
 
       elsif args.first == :super
-        prefix, template = @virtual_path.split('/')
+        @_view_paths ||= lookup_context.view_paths.clone
+        parts = @virtual_path.split('/')
+        template = parts.pop
+        prefix = parts.join('/')
+
         options = args[1] || {}
         options[:locals] ||= {}
         options[:locals] = view_stack.last[:locals].merge!(options[:locals]) if view_stack.last && view_stack.last[:locals]
@@ -80,19 +84,20 @@ module ActionView::Helpers #:nodoc:
           options[:prefixes] = lookup_context.prefixes.drop((lookup_context.prefixes.find_index(prefix) || -1) + 1)
         else
           options[:prefixes] = ['active_scaffold_overrides']
-          view_paths = lookup_context.view_paths
           last_view_path = File.expand_path(File.dirname(File.dirname(lookup_context.last_template.inspect)), Rails.root)
           lookup_context.view_paths = view_paths.drop(view_paths.find_index {|path| path.to_s == last_view_path} + 1)
         end
         result = render_without_active_scaffold options
-        lookup_context.view_paths = view_paths if view_paths
+        lookup_context.view_paths = @_view_paths if @_view_paths
         result
       else
+        @_view_paths ||= lookup_context.view_paths.clone
         last_template = lookup_context.last_template
         if args.first.is_a?(Hash)
           current_view = {:locals => args.first[:locals]}
           view_stack << current_view
         end
+        lookup_context.view_paths = @_view_paths # reset view_paths in case a view render :super, and then render :partial
         result = render_without_active_scaffold(*args, &block)
         view_stack.pop if current_view.present?
         lookup_context.last_template = last_template

data/lib/active_scaffold/finder.rb

@@ -116,8 +116,24 @@ module ActiveScaffold
           nil
         end
       end
+
+      def translate_days_and_months(value, format)
+        keys = {
+          '%A' => 'date.day_names',
+          '%a' => 'date.abbr_day_names',
+          '%B' => 'date.month_names',
+          '%b' => 'date.abbr_month_names'
+        }
+        keys.each do |f, k|
+          if format.include? f
+            table = Hash[I18n.t(k).compact.zip(I18n.t(k, :locale => :en).compact)]
+            value.gsub!(Regexp.union(table.keys)) { |s| table[s] }
+          end
+        end
+        value
+      end
       
-      def condition_value_for_datetime(value, conversion = :to_time)
+      def condition_value_for_datetime(column, value, conversion = :to_time)
         if value.is_a? Hash
           Time.zone.local(*[:year, :month, :day, :hour, :minute, :second].collect {|part| value[part].to_i}) rescue nil
         elsif value.respond_to?(:strftime)
@@ -129,19 +145,30 @@ module ActiveScaffold
             value.send(conversion)
           end
         elsif conversion == :to_date
-          Date.strptime(value, I18n.t('date.formats.default')) rescue nil
+          Date.strptime(value, I18n.t("date.formats.#{column.options[:format] || :default}")) rescue nil
         else
           parts = Date._parse(value)
-          format = I18n.translate 'time.formats.picker', :default => '' if ActiveScaffold.js_framework == :jquery
+          format = I18n.translate "time.formats.#{column.options[:format] || :picker}", :default => '' if ActiveScaffold.js_framework == :jquery
           if format.blank?
             time_parts = [[:hour, '%H'], [:min, '%M'], [:sec, '%S']].collect {|part, format_part| format_part if parts[part].present?}.compact
             format = "#{I18n.t('date.formats.default')} #{time_parts.join(':')} #{'%z' if parts[:offset].present?}"
           else
+            if parts[:hour]
+              [[:min, '%M'], [:sec, '%S']].each {|part, f| format.gsub!(":#{f}", '') unless parts[part].present?}
+            else
+              value += ' 00:00:00'
+            end
             format += ' %z' if parts[:offset].present? && format !~ /%z/i
           end
-          time = DateTime.strptime(value, format)
-          time = Time.zone.local_to_utc(time).in_time_zone unless parts[:offset]
-          time = time.send(conversion) unless conversion == :to_time
+          if !parts[:year] && !parts[:month] && !parts[:mday]
+            value = "#{Date.today.strftime(format.gsub(/%[HI].*/, ''))} #{value}"
+          end
+          value = translate_days_and_months(value, format) if I18n.locale != :en
+          time = DateTime.strptime(value, format) rescue nil
+          if time
+            time = Time.zone.local_to_utc(time).in_time_zone unless parts[:offset]
+            time = time.send(conversion) unless conversion == :to_time
+          end
           time
         end unless value.nil? || value.blank?
       end
@@ -180,8 +207,8 @@ module ActiveScaffold
             
       def condition_for_datetime(column, value, like_pattern = nil)
         conversion = datetime_conversion_for_condition(column)
-        from_value = condition_value_for_datetime(value[:from], conversion)
-        to_value = condition_value_for_datetime(value[:to], conversion)
+        from_value = condition_value_for_datetime(column, value[:from], conversion)
+        to_value = condition_value_for_datetime(column, value[:to], conversion)
 
         if from_value.nil? and to_value.nil?
           nil

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -128,11 +128,15 @@ module ActiveScaffold
         options
       end
 
+      def field_attributes(column, record)
+        {}
+      end
+
       ##
       ## Form input methods
       ##
       
-      def grouped_options_for_select(column, select_options, optgroup)
+      def active_scaffold_grouped_options(column, select_options, optgroup)
         group_label = active_scaffold_config_for(column.association.klass).columns[optgroup].try(:association) ? :to_label : :to_s
         select_options.group_by(&optgroup.to_sym).collect do |group, options|
           [group.send(group_label), options.collect {|r| [r.to_label, r.id]}]
@@ -160,7 +164,7 @@ module ActiveScaffold
         active_scaffold_translate_select_options(options)
 
         if optgroup = options.delete(:optgroup)
-          select(:record, method, grouped_options_for_select(column, select_options, optgroup), options, html_options)
+          select(:record, method, active_scaffold_grouped_options(column, select_options, optgroup), options, html_options)
         else
           collection_select(:record, method, select_options, :id, :to_label, options, html_options)
         end

data/lib/active_scaffold/helpers/human_condition_helpers.rb

@@ -20,8 +20,8 @@ module ActiveScaffold
             "#{column.active_record_class.human_attribute_name(column.name)} #{as_(opt).downcase} '#{value[:from]}' #{opt == 'BETWEEN' ? '- ' + value[:to].to_s : ''}"
           when :date, :time, :datetime, :timestamp
             conversion = column.column.type == :date ? :to_date : :to_time
-            from = controller.condition_value_for_datetime(value[:from], conversion)
-            to = controller.condition_value_for_datetime(value[:to], conversion)
+            from = controller.condition_value_for_datetime(column, value[:from], conversion)
+            to = controller.condition_value_for_datetime(column, value[:to], conversion)
             "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value[:opt])} #{I18n.l(from)} #{value[:opt] == 'BETWEEN' ? '- ' + I18n.l(to) : ''}"
           when :select, :multi_select, :record_select
             associated = value
@@ -61,4 +61,4 @@ module ActiveScaffold
       end
     end
   end
-end
+end

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -278,7 +278,7 @@ module ActiveScaffold
       end
 
       def render_column_heading(column, sorting, sort_direction)
-        tag_options = {:id => active_scaffold_column_header_id(column), :class => column_heading_class(column, sorting), :title => column.description}
+        tag_options = {:id => active_scaffold_column_header_id(column), :class => column_heading_class(column, sorting), :title => strip_tags(column.description)}
         if column.name == :as_marked
           tag_options[:data] = {
             :ie_mode => :inline_checkbox,

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -94,7 +94,7 @@ module ActiveScaffold
         end
         
         if optgroup = options.delete(:optgroup)
-          select(:record, method, grouped_options_for_select(column, select_options, optgroup), options, html_options)
+          select(:record, method, active_scaffold_grouped_options(column, select_options, optgroup), options, html_options)
         elsif column.association
           collection_select(:record, method, select_options, :id, :to_label, options, html_options)
         else

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -479,7 +479,10 @@ module ActiveScaffold
         calculation = column_calculation(column)
         override_formatter = "render_#{column.name}_#{column.calculate.is_a?(Proc) ? :calculate : column.calculate}"
         calculation = send(override_formatter, calculation) if respond_to? override_formatter
+        format_column_calculation(column, calculation)
+      end
 
+      def format_column_calculation(column, calculation)
         "#{"#{as_(column.calculate)}: " unless column.calculate.is_a? Proc}#{format_column_value nil, column, calculation}"
       end
 

data/lib/active_scaffold/tableless.rb

@@ -36,7 +36,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
     end
 
     def find_one(id)
-      @klass.find_one(id, self)
+      @klass.find_one(id, self) or raise ActiveRecord::RecordNotFound
     end
 
     def execute_simple_calculation(operation, column_name, distinct)
@@ -51,8 +51,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
   class << self
     private
     def relation
-      @relation ||= ActiveScaffold::Tableless::Relation.new(self, arel_table)
-      super
+      ActiveScaffold::Tableless::Relation.new(self, arel_table)
     end
   end
 

data/lib/active_scaffold/version.rb

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

data/vendor/assets/javascripts/jquery-ui-timepicker-addon.js

@@ -621,19 +621,19 @@
 
         if (this.hour_slider) {
           this.control.options(this, this.hour_slider, 'hour', { min: this._defaults.hourMin, max: hourMax });
-          this.control.value(this, this.hour_slider, 'hour', this.hour);
+          this.control.value(this, this.hour_slider, 'hour', this.hour - this.hour % this._defaults.stepHour);
         }
         if (this.minute_slider) {
           this.control.options(this, this.minute_slider, 'minute', { min: this._defaults.minuteMin, max: minMax });
-          this.control.value(this, this.minute_slider, 'minute', this.minute);
+          this.control.value(this, this.minute_slider, 'minute', this.minute - this.minute % this._defaults.stepMinute);
         }
         if (this.second_slider) {
           this.control.options(this, this.second_slider, 'second', { min: this._defaults.secondMin, max: secMax });
-          this.control.value(this, this.second_slider, 'second', this.second);
+          this.control.value(this, this.second_slider, 'second', this.second - this.second % this._defaults.stepSecond);
         }
         if (this.millisec_slider) {
           this.control.options(this, this.millisec_slider, 'millisec', { min: this._defaults.millisecMin, max: millisecMax });
-          this.control.value(this, this.millisec_slider, 'millisec', this.millisec);
+          this.control.value(this, this.millisec_slider, 'millisec', this.millisec - this.millisec % this._defaults.stepMillisec);
         }
       }
 

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: -1389571633
+  hash: -1415994350
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - rc
-  version: 3.3.0.rc
+  - 2
+  version: 3.3.0.rc2
 platform: ruby
 authors: 
 - Many, see README
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-18 00:00:00 Z
+date: 2013-02-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -173,6 +174,7 @@ files:
 - app/views/active_scaffold_overrides/on_mark.js.erb
 - app/views/active_scaffold_overrides/on_update.js.erb
 - app/views/active_scaffold_overrides/render_field.js.erb
+- app/views/active_scaffold_overrides/render_field_inplace.html.erb
 - app/views/active_scaffold_overrides/row.js.erb
 - app/views/active_scaffold_overrides/search.html.erb
 - app/views/active_scaffold_overrides/show.html.erb
@@ -441,7 +443,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rails 3.1 Version of activescaffold supporting prototype and jquery