active_scaffold 3.2.14 → 3.2.15

data/CHANGELOG

@@ -1,4 +1,15 @@
-= 3.2.13 (not released yet)
+= 3.2.15 (not released yet)
+- Prepare to unify field overrides and list_ui method signatures
+- Add :optional to update.persistent
+- Add missing triggering of as:element_updated in new subform rows
+- Fix conditions for :select in field_search
+- Fix datetime field search
+- Fix authorization checking in member action links
+
+= 3.2.14
+- Fix default sorting, it was broken in 3.2.13
+
+= 3.2.13
 - Fix destroy action, was broken in 3.2.12
 - Remove default :method sorting for associations, it wasn't useful and can be slow
 - Rescue from ActiveScaffold::ActionNotAllowed and ActiveScaffold::RecordNotAllowed with 401 response, it can be overrided with deny_access method in ApplicationController.

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

@@ -72,7 +72,7 @@ jQuery(document).ready(function() {
     
     if (action_link) {
       var cancel_url = as_cancel.attr('href');
-      var refresh_data = action_link.tag.data('cancel-refresh');
+      var refresh_data = action_link.tag.data('cancel-refresh') || as_cancel.data('refresh');
       if (!refresh_data || !cancel_url) {
         action_link.close();
         return false;
@@ -547,6 +547,7 @@ var ActiveScaffold = {
     } else {
       server_error.show();
     }
+    ActiveScaffold.scroll_to(server_error, ActiveScaffold.config.scroll_on_close == 'checkInViewport');
   },
   
   find_action_link: function(element) {
@@ -626,9 +627,11 @@ var ActiveScaffold = {
   create_associated_record_form: function(element, content, options) {
     if (typeof(element) == 'string') element = '#' + element;
     var element = jQuery(element);
+    content = jQuery(content);
     if (options.singular == false) {
       if (!(options.id && jQuery('#' + options.id).size() > 0)) {
-        element.append(content);
+        var new_element = element.append(content);
+        content.trigger('as:element_updated');
       }
     } else {
       var current = jQuery('#' + element.attr('id') + ' .association-record')
@@ -636,6 +639,7 @@ var ActiveScaffold = {
         this.replace(current[0], content);
       } else {
         element.prepend(content);
+        content.trigger('as:element_updated');
       }
     }
   },

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

@@ -95,7 +95,7 @@ document.observe("dom:loaded", function() {
     var action_link = ActiveScaffold.find_action_link(as_cancel);
     
     if (action_link) {
-      var refresh_data = action_link.readAttribute('data-cancel-refresh');
+      var refresh_data = action_link.readAttribute('data-cancel-refresh') || as_cancel.readAttribute('data-refresh');
       if (refresh_data && action_link.refresh_url) {
         event.memo.url = action_link.refresh_url;
       } else if (!refresh_data || as_cancel.readAttribute('href').blank()) {

data/config/locales/de.yml

@@ -6,6 +6,7 @@ de:
     add: 'Hinzufügen'
     add_existing: 'Existierenden Eintrag hinzufügen'
     add_existing_model: 'Existierende %{model} hinzufügen'
+    apply: 'Apply'
     are_you_sure_to_delete: 'Sind Sie sicher?'
     cancel: 'Abbrechen'
     click_to_edit: 'Zum Editieren anklicken'

data/config/locales/en.yml

@@ -6,6 +6,7 @@ en:
     add: 'Add'
     add_existing: 'Add Existing'
     add_existing_model: 'Add Existing %{model}'
+    apply: 'Apply'
     are_you_sure_to_delete: 'Are you sure you want to delete %{label}?'
     cancel: 'Cancel'
     click_to_edit: 'Click to edit'

data/config/locales/es.yml

@@ -6,6 +6,7 @@ es:
     add: 'Añadir'
     add_existing: 'Añadir Existente'
     add_existing_model: 'Añadir %{model} Existente'
+    apply: 'Aplicar'
     are_you_sure_to_delete: '¿Estás seguro de que quieres borrar %{label}?'
     cancel: 'Cancelar'
     click_to_edit: 'Pulsa para editar'

data/config/locales/fr.yml

@@ -6,6 +6,7 @@ fr:
     add: 'Ajouter'
     add_existing: 'Ajouter un(e) existant(e)'
     add_existing_model: 'Ajouter un(e) %{model} existant(e)'
+    apply: 'Apply'
     are_you_sure_to_delete: 'Êtes vous sûr?'
     cancel: 'Annuler'
     click_to_edit: 'Cliquer pour éditer'

data/config/locales/hu.yml

@@ -6,6 +6,7 @@ hu:
     add: 'Hozzáadás'
     add_existing: 'Meglevő hozzáadása'
     add_existing_model: 'Meglevő %{model} hozzáadása'
+    apply: 'Apply'
     are_you_sure_to_delete: 'Biztos vagy benne?'
     cancel: 'Mégse'
     click_to_edit: 'Kattints a szerkesztéshez'

data/config/locales/ja.yml

@@ -6,6 +6,7 @@ ja:
     add: '追加'
     add_existing: '既存のものを追加'
     add_existing_model: '既存の%{model}を追加'
+    apply: 'Apply'
     are_you_sure_to_delete: '本当によいですか？'
     cancel: 'キャンセル'
     click_to_edit: 'クリックして編集'

data/config/locales/ru.yml

@@ -6,6 +6,7 @@ ru:
     add: 'Добавить запись'
     add_existing: 'Добавить существующую запись'
     add_existing_model: '%{model}: добавить существующую запись'
+    apply: 'Apply'
     are_you_sure_to_delete: 'Удалить %{label}?'
     cancel: 'Отмена'
     click_to_edit: 'Нажмите для редактирования'

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

@@ -5,9 +5,11 @@
    if active_scaffold_config.actions.include? form_action
      multipart ||= active_scaffold_config.send(form_action).multipart?
      columns ||= active_scaffold_config.send(form_action).columns
+     persistent ||= active_scaffold_config.send(form_action).persistent
    else
      multipart ||= false
      columns ||= nil
+     persistent ||= false
    end
    method ||= :post
    cancel_link = true if cancel_link.nil?
@@ -40,7 +42,8 @@ end
   <%= render :partial => body_partial, :locals => { :columns => columns, :form_action => form_action, :scope => scope } %>
 
   <p class="form-footer">
-    <%= submit_tag as_(submit_text), :class => "submit" %>
+    <%= submit_tag as_(submit_text), :class => "submit" if !persistent || persistent == :optional %>
+    <%= submit_tag as_(:apply), :class => "submit", :name => 'dont_close' if persistent %>
     <%= link_to(as_(:cancel), main_path_to_return, cancel_options) if cancel_link %>
     <%= loading_indicator_tag(:action => form_action, :id => params[:id]) %>
     <%= render :partial => footer_extension, :locals => { :form_action => form_action } if footer_extension %>

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

@@ -3,7 +3,12 @@ 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 !active_scaffold_config.update.persistent %>
+  <% if params[:dont_close] %>
+    <% row_selector = element_row_id(:action => :list, :id => @record.id) %>
+    ActiveScaffold.update_row('<%= row_selector %>', '<%= escape_javascript(render(:partial => 'list_record', :locals => {:record => @record})) %>');
+    <%= render :partial => 'update_calculations', :formats => [:js] %>
+    ActiveScaffold.scroll_to('<%= row_selector %>', true);
+  <% else %>
     <% if render_parent? %>
       <% if nested_singular_association? || render_parent_action == :row %>
         action_link.close(true);
@@ -13,8 +18,7 @@ action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'mes
     <% elsif update_refresh_list? %>
       <%= render :partial => 'refresh_list' %>
     <% else %>
-      <% updated_row = render :partial => 'list_record', :locals => {:record => @record} %>
-      action_link.close('<%= escape_javascript(updated_row) %>');
+      action_link.close('<%= escape_javascript(render(:partial => 'list_record', :locals => {:record => @record})) %>');
       <%= render :partial => 'update_calculations', :formats => [:js] %>
     <% end %>
   <% end %>

data/lib/active_scaffold/actions/delete.rb

@@ -60,7 +60,7 @@ module ActiveScaffold::Actions
     # The default security delegates to ActiveRecordPermissions.
     # You may override the method to customize.
     def delete_authorized?(record = nil)
-      (!nested? || !nested.readonly?) && authorized_for?(:crud_type => :delete)
+      (!nested? || !nested.readonly?) && (record || self).send(:authorized_for?, :crud_type => :delete)
     end
     private
     def delete_authorized_filter

data/lib/active_scaffold/actions/list.rb

@@ -56,6 +56,7 @@ module ActiveScaffold::Actions
 
     # The actual algorithm to prepare for the list view
     def set_includes_for_list_columns
+      @cache_associations = true
       includes_for_list_columns = active_scaffold_config.list.columns.collect{ |c| c.includes }.flatten.uniq.compact
       self.active_scaffold_includes.concat includes_for_list_columns
     end

data/lib/active_scaffold/actions/show.rb

@@ -47,7 +47,7 @@ module ActiveScaffold::Actions
     # The default security delegates to ActiveRecordPermissions.
     # You may override the method to customize.
     def show_authorized?(record = nil)
-      authorized_for?(:crud_type => :read)
+      (record || self).send(:authorized_for?, :crud_type => :read)
     end
     private 
     def show_authorized_filter

data/lib/active_scaffold/actions/update.rb

@@ -139,7 +139,7 @@ module ActiveScaffold::Actions
     # The default security delegates to ActiveRecordPermissions.
     # You may override the method to customize.
     def update_authorized?(record = nil)
-      (!nested? || !nested.readonly?) && authorized_for?(:crud_type => :update)
+      (!nested? || !nested.readonly?) && (record || self).send(:authorized_for?, :crud_type => :update)
     end
     private
     def update_authorized_filter

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

@@ -49,13 +49,15 @@ ActionView::Base.class_eval do
 end
 ActiveScaffold::Finder::ClassMethods.module_eval do
   include ActiveScaffold::Bridges::Shared::DateBridge::Finder::ClassMethods
-  def datetime_conversion_for_condition(column)
+  def datetime_conversion_for_condition_with_datepicker(column)
     if column.search_ui == :date_picker
       :to_date
     else
-      super
+      datetime_conversion_for_condition_without_datepicker
     end
   end
+  alias_method_chain :datetime_conversion_for_condition, :datepicker
+  
   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

data/lib/active_scaffold/data_structures/action_links.rb

@@ -123,7 +123,7 @@ module ActiveScaffold::DataStructures
         elsif controller.nil? || !skip_action_link(controller, link, *(Array(options[:for])))
           security_method = link.security_method_set? || controller.respond_to?(link.security_method)
           authorized = if security_method
-            controller.send(link.security_method, *args)
+            controller.send(link.security_method, *(Array(options[:for])))
           else
             options[:for].nil? ? true : options[:for].authorized_for?(:crud_type => link.crud_type, :action => link.action)
           end

data/lib/active_scaffold/finder.rb

@@ -59,8 +59,8 @@ module ActiveScaffold
                 condition_for_range(column, value, like_pattern)
               when :date, :time, :datetime, :timestamp
                 condition_for_datetime(column, value)
-              when :select, :multi_select, :country, :usa_state
-                ["%{search_sql} in (?)", [Array(value)]]
+              when :select, :multi_select, :country, :usa_state, :chosen, :multi_chosen
+                ["%{search_sql} in (?)", Array(value)]
               else
                 if column.column.nil? || column.column.text?
                   ["%{search_sql} #{ActiveScaffold::Finder.like_operator} ?", like_pattern.sub('?', value)]

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -10,7 +10,12 @@ module ActiveScaffold
             # we only pass the record as the argument. we previously also passed the formatted_value,
             # but mike perham pointed out that prohibited the usage of overrides to improve on the
             # performance of our default formatting. see issue #138.
-            send(method, record)
+            if method(method).arity == 1
+              ActiveSupport::Deprecation.warn("Add column argument to field override, signature is unified with list_ui")
+              send(method, record)
+            else
+              send(method, record, column)
+            end
           # second, check if the dev has specified a valid list_ui for this column
           elsif column.list_ui and (method = override_column_ui(column.list_ui))
             send(method, column, record)
@@ -236,7 +241,7 @@ module ActiveScaffold
             Rails.logger.warn "ActiveScaffold: Enable eager loading for #{column.name} association to reduce SQL queries"
           elsif column.associated_limit > 0
             value.target = value.find(:all, :limit => column.associated_limit + 1, :select => column.select_columns)
-          else
+          elsif @cache_associations
             value.target = size.to_i.zero? ? [] : [nil]
           end
         end

data/lib/active_scaffold/helpers/show_column_helpers.rb

@@ -8,7 +8,12 @@ module ActiveScaffold
           # we only pass the record as the argument. we previously also passed the formatted_value,
           # but mike perham pointed out that prohibited the usage of overrides to improve on the
           # performance of our default formatting. see issue #138.
-          send(method, record)
+          if method(method).arity == 1
+            ActiveSupport::Deprecation.warn("Add column argument to field override, signature is unified with list_ui")
+            send(method, record)
+          else
+            send(method, record, column)
+          end
         # second, check if the dev has specified a valid list_ui for this column
         elsif column.list_ui and (method = override_show_column_ui(column.list_ui))
           send(method, column, record)

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 2
-    PATCH = 14
+    PATCH = 15
 
     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: 19
+  hash: 17
   prerelease: 
   segments: 
   - 3
   - 2
-  - 14
-  version: 3.2.14
+  - 15
+  version: 3.2.15
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-03 00:00:00 Z
+date: 2012-08-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -29,8 +29,8 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id001
-  name: shoulda
   prerelease: false
+  name: shoulda
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
@@ -45,8 +45,8 @@ dependencies:
         - 0
         version: 1.0.0
   version_requirements: *id002
-  name: bundler
   prerelease: false
+  name: bundler
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
@@ -59,8 +59,8 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id003
-  name: rcov
   prerelease: false
+  name: rcov
 - !ruby/object:Gem::Dependency 
   type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
@@ -75,8 +75,8 @@ dependencies:
         - 3
         version: 3.1.3
   version_requirements: *id004
-  name: rails
   prerelease: false
+  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: []
@@ -443,7 +443,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Rails 3.1 Version of activescaffold supporting prototype and jquery