active_scaffold 3.7.6 → 3.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfe45d0a0b28f5cb324e7104add97e7a105de6986accf8d64db02cf5f65f19ea
-  data.tar.gz: f8461b6a58ce6b1c93df2eaf95540a759fdcd73d21f256ee1a38ea4436b73987
+  metadata.gz: 5777dd56be3d144f2c62d8b2fa3cf8a0e765155d3afd445b5d150ce25c203155
+  data.tar.gz: 2c2ef1fbe12d539b84d81d48d1a2d373f3634a864664d61ab27099c783f404c4
 SHA512:
-  metadata.gz: a65de91f886605e57d0f183295d9d1f8ea358b4657826143265f8359f4d41761b6325644fcb6d5dc1d5e5d4b87bbc966bf8cd9d4ee66db0ae4048455eb0c6b62
-  data.tar.gz: 9fb4e3b6a38c5f340cdf430146ae9616a5e9a93e66c11e32dece9cb5704229499610da861916371e3bafb973d43705c9716228b5d04c50f896d5538320e0125c
+  metadata.gz: e13283f6ae89cf8618e070ee0e6afa87a47389eaee7043a669ab771f82c6aec2dbbdf2317c57ca6872785622e601d0d1278140e53cf24ca5245a88f9353dfe97
+  data.tar.gz: ea569709001c16bae097715c62fe9a9717597c288b2504d2c930e55aa01b28e77b53c29583d3e0462c86f329aebae8c8a82d73c832b14332a8999ee777d42e3c

data/CHANGELOG.rdoc

@@ -1,3 +1,11 @@
+= 3.7.7
+- Fix usage with mongoid, broken on 3.7.5
+- Support proc or lambda in label of action links
+- Set successful to false when update_column is not authorized for the column
+- Use action link's label for flash message when custom action is not authorized
+- Add default_value to columns, so default_value can be defined in AS config, overriding DB default
+- Fix caching query from association_klass_scoped in subforms, when returns different queries for the same association on different rows
+
 = 3.7.6
 - Respect :label_method set in form_ui_options on list.
 - Fix grouped search for PostgreSQL

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

@@ -4,7 +4,7 @@
       <h4><%= link.confirm(h(record&.to_label)) -%></h4>
 
       <p class="form-footer">
-        <%= submit_tag as_(link.label), :class => 'submit' %>
+        <%= submit_tag as_(link.label(record)), :class => 'submit' %>
         <%= link_to as_(:cancel), main_path_to_return, :class => 'cancel' %>
       </p>
 

data/lib/active_scaffold/actions/core.rb

@@ -294,7 +294,7 @@ module ActiveScaffold::Actions
       end
     end
 
-    def new_model
+    def empty_model
       relation = beginning_of_chain
       if nested? && nested.plural_association? && nested.match_model?(active_scaffold_config.model)
         build_options = sti_nested_build_options(relation.klass)
@@ -302,6 +302,18 @@ module ActiveScaffold::Actions
       relation.respond_to?(:build) ? relation.build(build_options || {}) : relation.new
     end
 
+    def new_model
+      empty_model.tap do |record|
+        assign_default_attributes record
+      end
+    end
+
+    def assign_default_attributes(record)
+      active_scaffold_config.columns.each do |column|
+        record.write_attribute column.name, column.default_value if column.default_value?
+      end
+    end
+
     def sti_nested_build_options(klass)
       config = active_scaffold_config_for(klass)
       return unless config
@@ -391,7 +403,7 @@ module ActiveScaffold::Actions
           get_row(crud_type_or_security_options)
           if @record.nil?
             self.successful = false
-            flash[:error] = as_(:no_authorization_for_action, :action => action_name)
+            flash[:error] = as_(:no_authorization_for_action, :action => @action_link&.label(nil) || action_name)
           else
             yield @record
           end

data/lib/active_scaffold/actions/field_search.rb

@@ -12,7 +12,7 @@ module ActiveScaffold::Actions
       # FieldSearch uses params[:search] and not @record because search conditions do not always pass the Model's validations.
       # This facilitates for example, textual searches against associations via .search_sql
       def show_search
-        @record = new_model
+        @record = empty_model
         super
       end
 

data/lib/active_scaffold/actions/update.rb

@@ -150,9 +150,8 @@ module ActiveScaffold::Actions
       params.delete(:original_html)
       params.delete(:original_value)
       @column = active_scaffold_config.columns[column]
-      value_record = record_for_update_column
-      return unless value_record
 
+      value_record = record_for_update_column
       value = value_for_update_column(value, @column, value_record)
       value_record.send("#{@column.name}=", value)
       before_update_save(@record)
@@ -168,16 +167,19 @@ module ActiveScaffold::Actions
         end
       end
       after_update_save(@record)
+    rescue ActiveScaffold::ActionNotAllowed
+      self.successful = false
     end
 
     def record_for_update_column
       @record = find_if_allowed(params[:id], :read)
-      return unless @record.authorized_for?(:crud_type => :update, :column => @column.name)
+      raise ActiveScaffold::ActionNotAllowed unless @record.authorized_for?(:crud_type => :update, :column => @column.name)
 
       if @column.delegated_association
         value_record = @record.send(@column.delegated_association.name)
         value_record ||= @record.association(@column.delegated_association.name).build
-        value_record if value_record.authorized_for?(:crud_type => :update, :column => @column.name)
+        raise ActiveScaffold::ActionNotAllowed unless value_record.authorized_for?(:crud_type => :update, :column => @column.name)
+        value_record
       else
         @record
       end
@@ -185,7 +187,7 @@ module ActiveScaffold::Actions
 
     def value_for_update_column(param_value, column, record)
       unless param_value
-        param_value = ActiveScaffold::Core.column_type_cast column.default_for_empty_value, column.column
+        param_value = column.default_for_empty_value
         param_value = false if param_value == true
       end
       value = column_value_from_param_value(record, column, param_value)

data/lib/active_scaffold/core.rb

@@ -267,12 +267,12 @@ module ActiveScaffold
     end
 
     def self.mongoid_column_type_cast(value, column)
-      return Time.zone.at(value.to_i) if value =~ /\A\d+\z/ && [Time, DateTime].include?(column.type)
+      return Time.zone.at(value.to_i) if [Time, DateTime].include?(column.type) && value =~ /\A\d+\z/
       column.type.evolve value
     end
 
     def self.active_record_column_type_cast(value, column_or_type)
-      return Time.zone.at(value.to_i) if value =~ /\A\d+\z/ && %i[time datetime].include?(column_or_type.type)
+      return Time.zone.at(value.to_i) if %i[time datetime].include?(column_or_type.type) && value =~ /\A\d+\z/
       cast_type = column_or_type.is_a?(ActiveRecord::ConnectionAdapters::Column) ? ActiveRecord::Type.lookup(column_or_type.type) : column_or_type
       cast_type ? cast_type.cast(value) : value
     end

data/lib/active_scaffold/data_structures/action_link.rb

@@ -77,8 +77,15 @@ module ActiveScaffold::DataStructures
 
     # what string to use to represent this action
     attr_writer :label
-    def label
-      @label.is_a?(Symbol) ? ActiveScaffold::Registry.cache(:translations, @label) { as_(@label) } : @label
+    def label(record = nil)
+      case @label
+      when Symbol
+        ActiveScaffold::Registry.cache(:translations, @label) { as_(@label) }
+      when Proc
+        @label.call(record)
+      else
+        @label
+      end
     end
 
     # image to use {:name => 'arrow.png', :size => '16x16'}

data/lib/active_scaffold/data_structures/action_links.rb

@@ -139,8 +139,15 @@ module ActiveScaffold::DataStructures
     end
 
     attr_writer :label
-    def label
-      as_(@label) if @label
+    def label(record)
+      case @label
+      when Symbol
+        ActiveScaffold::Registry.cache(:translations, @label) { as_(@label) }
+      when Proc
+        @label.call(record)
+      else
+        @label
+      end
     end
 
     def method_missing(name, *args, &block)

data/lib/active_scaffold/data_structures/column.rb

@@ -37,6 +37,19 @@ module ActiveScaffold::DataStructures
       @params ||= NO_PARAMS.dup
     end
 
+    def default_value
+      @default_value || @db_default_value
+    end
+
+    def default_value=(value)
+      raise ArgumentError, "Can't set default value for non-DB columns (virtual columns or associations)" unless column
+      @default_value = value
+    end
+
+    def default_value?
+      defined? @default_value
+    end
+
     # the display-name of the column. this will be used, for instance, as the column title in the table and as the field name in the form.
     # if left alone it will utilize human_attribute_name which includes localization
     attr_writer :label
@@ -377,6 +390,7 @@ module ActiveScaffold::DataStructures
       if @column.nil? && active_record? && active_record_class._default_attributes.key?(name.to_s)
         @column = active_record_class._default_attributes[name.to_s]
       end
+      @db_default_value = ActiveScaffold::OrmChecks.default_value active_record_class, name if @column
       @delegated_association = delegated_association
       @cache_key = [@active_record_class.name, name].compact.map(&:to_s).join('#')
       setup_association_info
@@ -455,10 +469,8 @@ module ActiveScaffold::DataStructures
       return nil unless column
       if column.is_a?(ActiveModel::Attribute)
         column.value
-      elsif active_record?
-        null? ? nil : column.default
-      elsif mongoid?
-        column.default_val
+      else
+        default_value
       end
     end
 
@@ -487,10 +499,6 @@ module ActiveScaffold::DataStructures
       ActiveScaffold::OrmChecks.column_type active_record_class, name
     end
 
-    def default_value
-      ActiveScaffold::OrmChecks.column_type active_record_class, name
-    end
-
     def attributes=(opts)
       opts.each do |setting, value|
         send "#{setting}=", value

data/lib/active_scaffold/helpers/action_link_helpers.rb

@@ -68,7 +68,7 @@ module ActiveScaffold
             group_tag = :li
           end
           content = content_tag(group_tag, :class => html_classes.presence, :onclick => ('' if hover_via_click?)) do
-            content_tag(:div, as_(link.label), :class => link.name.to_s.downcase) << content_tag(:ul, content)
+            content_tag(:div, as_(link.label(record)), :class => link.name.to_s.downcase) << content_tag(:ul, content)
           end
         else
           content = render_action_link(link, record, options)
@@ -86,7 +86,7 @@ module ActiveScaffold
         end
         if link.action.nil? || (link.type == :member && options.key?(:authorized) && !options[:authorized])
           html_class = "disabled #{link.action}#{" #{link.html_options[:class]}" if link.html_options[:class].present?}"
-          html_options = {:link => action_link_text(link, options), :class => html_class, :title => options[:not_authorized_reason]}
+          html_options = {:link => action_link_text(link, record, options), :class => html_class, :title => options[:not_authorized_reason]}
           action_link_html(link, nil, html_options, record)
         else
           url = action_link_url(link, record)
@@ -298,8 +298,8 @@ module ActiveScaffold
         url_options
       end
 
-      def action_link_text(link, options)
-        text = image_tag(link.image[:name], :size => link.image[:size], :alt => options[:link] || link.label, :title => options[:link] || link.label) if link.image
+      def action_link_text(link, record, options)
+        text = image_tag(link.image[:name], :size => link.image[:size], :alt => options[:link] || link.label(record), :title => options[:link] || link.label(record)) if link.image
         text || options[:link]
       end
 
@@ -329,7 +329,7 @@ module ActiveScaffold
       def action_link_html_options(link, record, options)
         link_id = get_action_link_id(link, record)
         html_options = link.html_options.merge(:class => [link.html_options[:class], link.action.to_s].compact.join(' '))
-        html_options[:link] = action_link_text(link, options)
+        html_options[:link] = action_link_text(link, record, options)
 
         # Needs to be in html_options to as the adding _method to the url is no longer supported by Rails
         html_options[:method] = link.method if link.method != :get
@@ -388,7 +388,7 @@ module ActiveScaffold
 
       def action_link_html(link, url, html_options, record)
         label = html_options.delete(:link)
-        label ||= link.label
+        label ||= link.label(record)
         if url.nil?
           content_tag(:a, label, html_options)
         else

data/lib/active_scaffold/helpers/association_helpers.rb

@@ -6,7 +6,7 @@ module ActiveScaffold
       def cache_association_options(association, conditions, klass, cache = true)
         if active_scaffold_config.cache_association_options && cache
           @_associations_cache ||= Hash.new { |h, k| h[k] = {} }
-          key = [association.name, association.inverse_klass.name, klass.name].join('/')
+          key = [association.name, association.inverse_klass.name, klass.respond_to?(:cache_key) ? klass.cache_key : klass.name].join('/')
           @_associations_cache[key][conditions] ||= yield
         else
           yield
@@ -31,8 +31,8 @@ module ActiveScaffold
         end
 
         conditions ||= send(association_helper_method(association, :options_for_association_conditions), association, record)
+        klass = send(association_helper_method(association, :association_klass_scoped), association, klass, record)
         cache_association_options(association, conditions, klass, cache) do
-          klass = send(association_helper_method(association, :association_klass_scoped), association, klass, record)
           relation = klass.where(conditions)
           column = column_for_association(association, record)
           if column&.includes

data/lib/active_scaffold/helpers/controller_helpers.rb

@@ -181,6 +181,7 @@ module ActiveScaffold
           parent_record.send("build_#{association.name}")
         else
           association.klass.new.tap do |record|
+            assign_default_attributes record
             save_record_to_association(record, association.reverse_association, parent_record) # set inverse
           end
         end

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -157,7 +157,7 @@ module ActiveScaffold
         cache_keys ||= [method, model.name]
         ActiveScaffold::Registry.cache(*cache_keys) do
           model_names = [model.name]
-          model_names << model.base_class.name if model.base_class != model
+          model_names << model.base_class.name if model.respond_to?(:base_class) && model.base_class != model
           method_with_class = model_names.find do |model_name|
             method_with_class = "#{clean_class_name(model_name)}_#{method}"
             break method_with_class if respond_to?(method_with_class)

data/lib/active_scaffold/orm_checks.rb

@@ -85,9 +85,9 @@ module ActiveScaffold
 
       def default_value(klass, column_name)
         if ActiveScaffold::OrmChecks.mongoid? klass
-          columns_hash(klass)[column_name]&.default_val
+          columns_hash(klass)[column_name.to_s]&.default_val
         elsif ActiveScaffold::OrmChecks.active_record? klass
-          klass._default_attributes[column_name]&.value
+          klass._default_attributes[column_name.to_s]&.value
         end
       end
 

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.7.6
+  version: 3.7.7
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-26 00:00:00.000000000 Z
+date: 2024-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails