lib/active_scaffold/config/mark.rb in active_scaffold-3.2.11 vs lib/active_scaffold/config/mark.rb in active_scaffold-3.2.12

- old
+ new

@@ -11,25 +11,20 @@ attr_accessor :mark_all_mode def initialize(core_config) @core = core_config @mark_all_mode = self.class.mark_all_mode - if core_config.actions.include?(:update) - @core.model.send(:include, ActiveScaffold::MarkedModel) unless @core.model.ancestors.include?(ActiveScaffold::MarkedModel) - add_mark_column - else - raise "Mark action requires update action in controller for model: #{core_config.model.to_s}" - end + @core.model.send(:include, ActiveScaffold::MarkedModel) unless @core.model < ActiveScaffold::MarkedModel + add_mark_column end protected def add_mark_column - @core.columns.add :marked - @core.columns[:marked].label = 'M' - @core.columns[:marked].form_ui = :checkbox - @core.columns[:marked].inplace_edit = true - @core.columns[:marked].sort = false - @core.list.columns = [:marked] + @core.list.columns.names_without_auth_check unless @core.list.columns.include? :marked + @core.columns.add :as_marked + @core.columns[:as_marked].label = 'M' + @core.columns[:as_marked].list_ui = :marked + @core.columns[:as_marked].sort = false + @core.list.columns = [:as_marked] + @core.list.columns.names_without_auth_check unless @core.list.columns.include? :as_marked end end end