active_scaffold 3.4.5 → 3.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f474117432310ae21c926433541aa5849b9303b
-  data.tar.gz: 1ebb3ec0f64123d0afc586b4015e29a4d634a294
+  metadata.gz: ac10aec1fac3d66afecec71c2262dedb311c000c
+  data.tar.gz: 77208c9dbc9f3c50b8bd88265ba645be6fe6e857
 SHA512:
-  metadata.gz: 33bfb4cd1023bc82fe3c2974f4725794688b8a96e11033c62081f16dce820e6d31ae09a321949e70605312aa51d87c17a60c373378b9fda71079512803e418f3
-  data.tar.gz: 1f351e2a0d0e5b49cfb952c6763fb0ecd826cc91788ddd8c4cb7c6999a2e02ccdee0f7e1867c730ce09f27029de4e9655a39b3da13d4812d363d14cdb24c322a
+  metadata.gz: 8cd83d6362143864a3cf2c753163562821da1c32ebb641f0b0e25e49459b3bbee91c415db5f1a256b13a8a06a1d774361c0233bdffd1902ae0f9417b9e004b62
+  data.tar.gz: da1a7da25ad88b2d88ce8811e5d6d4b830c2991a673bc90412f68b30244e4141a51b2119cf0415a11daa8a2f99ad99166f3d7845921e671d6ed0ac37653a5c0d

data/CHANGELOG

@@ -1,3 +1,15 @@
+= 3.4.7 (not released yet)
+- sorting by primary key added by default only for postgres, on mysql it will avoid using index to sort (you can see using filesort on explain), slowdown sorting
+- fix set_parent on rails 3.2 with attr_accessible
+- fix saving changes on render_field when blank row is changed and request render_field action
+
+= 3.4.6
+- Add paper_trail bridge (requires 3.0.5 version for nested support). It adds:
+    - a collection link to deleted action which display deleted_records
+    - a member link to PaperTrail::VersionsController which display changes for current record. PaperTrail::VersionsController must be added, not included with ActiveScaffold.
+- Focus first element on persistent create forms when form is reloaded
+- Fix linking to non-namespaced controller from namespaced controller
+
 = 3.4.5
 - Fix default sorting on ruby 1.8
 - Fix add existing button, broken on 3.4.4

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

@@ -30,6 +30,7 @@ action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'mes
       ActiveScaffold.reset_form('<%= form_selector %>');
     <% elsif params[:dont_close] %>
       ActiveScaffold.replace('<%= form_selector %>','<%= escape_javascript(render(:partial => 'create_form', :locals => {:xhr => true})) %>');
+      ActiveScaffold.focus_first_element_of_form('<%= form_selector %>');
     <% else %>
       action_link.close();
     <% end %>

data/config/locales/en.yml

@@ -21,6 +21,7 @@ en:
     between: Between
     cancel: Cancel
     cant_destroy_record: "%{record} can't be destroyed"
+    changes: Changes
     click_to_edit: "Click to edit"
     click_to_reset: "Click to reset"
     close: Close
@@ -43,6 +44,7 @@ en:
     days: Days
     delete: Delete
     deleted_model: "Deleted %{model}"
+    deleted_records: "List Deleted Records"
     delimiter: Delimiter
     download: Download
     edit: Edit

data/config/locales/es.yml

@@ -21,6 +21,7 @@ es:
     between: Entre
     cancel: Cancelar
     cant_destroy_record: "No se pudo borrar %{record}"
+    changes: Cambios
     click_to_edit: "Pulsa para editar"
     click_to_reset: "Pulsa para restaurar"
     close: Cerrar
@@ -43,6 +44,7 @@ es:
     days: Días
     delete: Borrar
     deleted_model: "%{model} borrado"
+    deleted_records: "Ver Eliminados"
     delimiter: Delimitador
     download: Descargar
     edit: Editar

data/lib/active_scaffold/actions/core.rb

@@ -84,7 +84,7 @@ module ActiveScaffold::Actions
           @record.id = params[:id]
         end
         set_parent(@record) if @record.id.nil? && params[:parent_controller] && @scope
-        
+
         after_render_field(@record, @column)
       end
     end
@@ -97,7 +97,7 @@ module ActiveScaffold::Actions
         parent = parent_model.new
         copy_attributes(parent_model.find(params[:parent_id]), parent) if params[:parent_id]
         parent.id = params[:parent_id]
-        parent = update_record_from_params(parent, active_scaffold_config_for(parent_model).send(params[:parent_id] ? :update : :create).columns, params[:record]) if @column.send_form_on_update_column
+        parent = update_record_from_params(parent, active_scaffold_config_for(parent_model).send(params[:parent_id] ? :update : :create).columns, params[:record], true) if @column.send_form_on_update_column
         apply_constraints_to_record(parent) if params[:parent_id]
         if record.class.reflect_on_association(association).collection?
           record.send(association) << parent
@@ -107,10 +107,14 @@ module ActiveScaffold::Actions
       end
     end
 
-    def copy_attributes(orig, dst)
+    def copy_attributes(orig, dst = nil)
+      dst ||= orig.class.new
       attributes = orig.attributes
-      if orig.class.respond_to? :protected_attributes
-        orig.class.protected_attributes.each { |attr| dst[attr] = orig[attr] }
+      if orig.class.respond_to?(:accessible_attributes) && orig.class.accessible_attributes.present?
+        attributes.each { |attr, value| dst.send :write_attribute, attr, value if orig.class.accessible_attributes.deny? attr }
+        attributes = attributes.slice(*orig.class.accessible_attributes)
+      elsif orig.class.respond_to? :protected_attributes
+        orig.class.protected_attributes.each { |attr| dst.send :write_attribute, attr, orig[attr] }
         attributes = attributes.except(*orig.class.protected_attributes)
       end
       dst.attributes = attributes

data/lib/active_scaffold/attribute_params.rb

@@ -59,7 +59,7 @@ module ActiveScaffold
           if multi_parameter_attributes.has_key? column.name.to_s
             parent_record.send(:assign_multiparameter_attributes, multi_parameter_attributes[column.name.to_s])
           elsif attributes.has_key? column.name
-            value = column_value_from_param_value(parent_record, column, attributes[column.name])
+            value = column_value_from_param_value(parent_record, column, attributes[column.name], avoid_changes)
             if avoid_changes && column.plural_association?
               parent_record.association(column.name).target = value
             else
@@ -84,13 +84,13 @@ module ActiveScaffold
       parent_record
     end
 
-    def column_value_from_param_value(parent_record, column, value)
+    def column_value_from_param_value(parent_record, column, value, avoid_changes = false)
       # convert the value, possibly by instantiating associated objects
       form_ui = column.form_ui || column.column.try(:type)
       if form_ui && self.respond_to?("column_value_for_#{form_ui}_type", true)
         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)
+        column_value_from_param_hash_value(parent_record, column, value, avoid_changes)
       else
         column_value_from_param_simple_value(parent_record, column, value)
       end
@@ -146,25 +146,25 @@ module ActiveScaffold
       end
     end
 
-    def column_value_from_param_hash_value(parent_record, column, value)
+    def column_value_from_param_hash_value(parent_record, column, value, avoid_changes = false)
       if column.singular_association?
-        manage_nested_record_from_params(parent_record, column, value)
+        manage_nested_record_from_params(parent_record, column, value, avoid_changes)
       elsif column.plural_association?
         value = value.sort if RUBY_VERSION < '1.9'
         # HACK to be able to delete all associated records, hash will include "0" => ""
-        value.collect {|key, value| manage_nested_record_from_params(parent_record, column, value) unless value == ""}.compact
+        value.collect {|key, value| manage_nested_record_from_params(parent_record, column, value, avoid_changes) unless value == ""}.compact
       else
         value
       end
     end
     
-    def manage_nested_record_from_params(parent_record, column, attributes)
+    def manage_nested_record_from_params(parent_record, column, attributes, avoid_changes = false)
       return nil unless build_record_from_params(attributes, column, parent_record)
       record = find_or_create_for_params(attributes, column, parent_record)
       if record
         record_columns = active_scaffold_config_for(column.association.klass).subform.columns
         record_columns.constraint_columns = [column.association.reverse]
-        update_record_from_params(record, record_columns, attributes)
+        update_record_from_params(record, record_columns, attributes, avoid_changes)
         record.unsaved = true
       end
       record

data/lib/active_scaffold/bridges/paper_trail.rb

@@ -0,0 +1,10 @@
+class ActiveScaffold::Bridges::PaperTrail < ActiveScaffold::DataStructures::Bridge
+  def self.install
+    require File.join(File.dirname(__FILE__), "paper_trail/paper_trail_bridge")
+    require File.join(File.dirname(__FILE__), "paper_trail/actions")
+    require File.join(File.dirname(__FILE__), "paper_trail/config")
+    require File.join(File.dirname(__FILE__), "paper_trail/helper")
+    ActiveScaffold::Config::Core.send :include, ActiveScaffold::Bridges::PaperTrail::PaperTrailBridge
+    ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:deleted] = :get
+  end
+end

data/lib/active_scaffold/bridges/paper_trail/actions.rb

@@ -0,0 +1,23 @@
+module ActiveScaffold::Actions
+  module DeletedRecords
+    def self.included(base)
+      base.class_eval do
+        config = active_scaffold_config
+        if config.actions.include?(:nested) && config.deleted_records.nested_link_group
+          config.configure { nested.add_link :versions, :label => config.deleted_records.nested_link_label, :action_group => config.deleted_records.nested_link_group }
+        end
+      end
+    end
+
+    def deleted
+      query = PaperTrail::Version.destroys.where(:item_type => active_scaffold_config.model)
+      query = query.where_object(nested.child_association.foreign_key => nested.parent_id) if nested? && nested.child_association.macro == :belongs_to && PaperTrail::Version.respond_to?(:where_object)
+      pager = Paginator.new(query.count, active_scaffold_config.list.per_page) do |offset, per_page|
+        query.offset(offset).limit(per_page).map(&:reify)
+      end
+      @page = pager.page(params[:page] || 1)
+      @records = @page.items
+      respond_to_action(:list)
+    end
+  end
+end

data/lib/active_scaffold/bridges/paper_trail/config.rb

@@ -0,0 +1,29 @@
+module ActiveScaffold::Config
+  class DeletedRecords < Base
+    self.crud_type = :read
+
+    def initialize(core_config)
+      super
+      @nested_link_label = self.class.nested_link_label
+      @nested_link_group = self.class.nested_link_group
+    end
+
+    # the ActionLink for this action
+    cattr_accessor :link
+    @@link = ActiveScaffold::DataStructures::ActionLink.new(:deleted, :label => :deleted_records, :type => :collection)
+
+    # label for versions nested link
+    cattr_accessor :nested_link_label
+    @@nested_link_label = :changes
+
+    # group for versions nested link
+    cattr_accessor :nested_link_group
+    @@nested_link_group = 'member'
+
+    # label for versions nested link
+    attr_accessor :nested_link_label
+
+    # group for versions nested link
+    attr_accessor :nested_link_group
+  end
+end

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

@@ -0,0 +1,20 @@
+module ActiveScaffold::Bridges
+  class PaperTrail
+    module Helper
+      def filter_action_links_for_deleted(action_links, record, options)
+      end
+
+      def display_action_links(action_links, record, options, &block)
+        if action_name == 'deleted'
+          action_links = filter_action_links_for_deleted(action_links, record, options)
+          return unless action_links
+        end
+        super(action_links, record, options, &block)
+      end
+    end
+  end
+end
+
+ActionView::Base.class_eval do
+  include ActiveScaffold::Bridges::PaperTrail::Helper
+end

data/lib/active_scaffold/bridges/paper_trail/paper_trail_bridge.rb

@@ -0,0 +1,17 @@
+module ActiveScaffold
+  module Bridges
+    class PaperTrail
+      module PaperTrailBridge
+        def initialize_with_paper_trail(model_id)
+          initialize_without_paper_trail(model_id)
+          return unless self.model < ::PaperTrail::Model::InstanceMethods
+          self.actions << :deleted_records
+        end
+        
+        def self.included(base)
+          base.alias_method_chain :initialize, :paper_trail
+        end
+      end
+    end
+  end
+end

data/lib/active_scaffold/core.rb

@@ -171,7 +171,7 @@ module ActiveScaffold
         controller = active_scaffold_controller_for_column(column, options)
         
         unless controller.nil?
-          options.reverse_merge! :position => :after, :type => :member, :controller => (controller == :polymorph ? controller : controller.controller_path), :column => column
+          options.reverse_merge! :position => :after, :type => :member, :controller => (controller == :polymorph ? controller : "/#{controller.controller_path}"), :column => column
           options[:parameters] ||= {}
           options[:parameters].reverse_merge! :association => column.association.name
           if column.plural_association?

data/lib/active_scaffold/data_structures/sorting.rb

@@ -4,6 +4,7 @@ module ActiveScaffold::DataStructures
     include Enumerable
 
     attr_accessor :constraint_columns
+    attr_accessor :sorting_by_primary_key
 
     def initialize(columns)
       @columns = columns
@@ -18,7 +19,8 @@ module ActiveScaffold::DataStructures
       # fallback to setting primary key ordering
       if model.column_names.include?(model.primary_key)
         set([model.primary_key, 'ASC'])
-        @sorting_by_primary_key = clause
+        @primary_key_clause = clause
+        @sorting_by_primary_key = model.connection.try(:adapter_name) == 'PostgreSQL' # mandatory for postgres, so enabled by default
       end
       # If an ORDER BY clause is found set default sorting according to it
       if order_clause
@@ -121,7 +123,7 @@ module ActiveScaffold::DataStructures
         order << Array(sql).map {|column| "#{column} #{sort_direction}"}.join(', ')
       end
 
-      order << @sorting_by_primary_key if @sorting_by_primary_key # mandatory for postgres
+      order << @primary_key_clause if @sorting_by_primary_key
       order unless order.empty?
     end
 

data/lib/active_scaffold/helpers/pagination_helpers.rb

@@ -6,7 +6,7 @@ module ActiveScaffold
       end
 
       def pagination_url_options(url_options = nil)
-        url_options ||= params_for(:action => :index)
+        url_options ||= params_for
         unless active_scaffold_config.store_user_settings
           url_options.merge!(:search => search_params) if search_params.present?
           if active_scaffold_config.list.user.user_sorting?

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.5
+  version: 3.4.7
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -230,6 +230,11 @@ files:
 - lib/active_scaffold/bridges/file_column/test/functional/file_column_keep_test.rb
 - lib/active_scaffold/bridges/file_column/test/mock_model.rb
 - lib/active_scaffold/bridges/file_column/test/test_helper.rb
+- lib/active_scaffold/bridges/paper_trail.rb
+- lib/active_scaffold/bridges/paper_trail/actions.rb
+- lib/active_scaffold/bridges/paper_trail/config.rb
+- lib/active_scaffold/bridges/paper_trail/helper.rb
+- lib/active_scaffold/bridges/paper_trail/paper_trail_bridge.rb
 - lib/active_scaffold/bridges/paperclip.rb
 - lib/active_scaffold/bridges/paperclip/form_ui.rb
 - lib/active_scaffold/bridges/paperclip/list_ui.rb