active_scaffold 3.2.11 → 3.2.12

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -123,9 +123,11 @@ module ActiveScaffold
         url_options[:controller] = link.controller.to_s if link.controller
         url_options.delete(:search) if link.controller and link.controller.to_s != params[:controller]
         url_options.merge! link.parameters if link.parameters
-        @link_record = record
-        url_options.merge! self.instance_eval(&(link.dynamic_parameters)) if link.dynamic_parameters.is_a?(Proc)
-        @link_record = nil
+        if link.dynamic_parameters.is_a?(Proc)
+          @link_record = record
+          url_options.merge! self.instance_eval(&(link.dynamic_parameters)) 
+          @link_record = nil
+        end
         url_options_for_nested_link(link.column, record, link, url_options, options) if link.nested_link?
         url_options_for_sti_link(link.column, record, link, url_options, options) unless record.nil? || active_scaffold_config.sti_children.nil?
         url_options[:_method] = link.method if !link.confirm? && link.inline? && link.method != :get
@@ -180,7 +182,7 @@ module ActiveScaffold
         if link.image.nil?
           html = link_to(label, url, html_options)
         else
-          html = link_to(image_tag(link.image[:name] , :size => link.image[:size], :alt => label), url, html_options)
+          html = link_to(image_tag(link.image[:name], :size => link.image[:size], :alt => label, :title => label), url, html_options)
         end
         # if url is nil we would like to generate an anchor without href attribute
         url.nil? ? html.sub(/href=".*?"/, '').html_safe : html.html_safe
@@ -195,7 +197,8 @@ module ActiveScaffold
           url_options[active_scaffold_config.model.name.foreign_key.to_sym] = url_options.delete(:id)
           url_options[:eid] = nil # needed for nested scaffolds open from an embedded scaffold
         end
-        nested.constrained_fields.each { |field| url_options.delete field } if nested?
+        url_options.except! *params_conditions
+        url_options.except! *nested.constrained_fields if nested?
       end
 
       def url_options_for_sti_link(column, record, link, url_options, options = {})
@@ -237,7 +240,7 @@ module ActiveScaffold
         classes << 'empty' if column_empty? column_value
         classes << 'sorted' if active_scaffold_config.list.user.sorting.sorts_on?(column)
         classes << 'numeric' if column.column and [:decimal, :float, :integer].include?(column.column.type)
-        classes << 'in_place_editor_field' if inplace_edit?(record, column)
+        classes << 'in_place_editor_field' if inplace_edit?(record, column) or column.list_ui == :marked
         classes.join(' ').rstrip
       end
       
@@ -308,6 +311,19 @@ module ActiveScaffold
         method if respond_to?(method)
       end
 
+      def display_message(message)
+        if (highlights = active_scaffold_config.highlight_messages)
+          message = highlights.inject(message) do |msg, (phrases, highlighter)|
+            highlight(msg, phrases, highlighter)
+          end
+        end
+        if (format = active_scaffold_config.timestamped_messages)
+          format = :short if format == true
+          message = "#{content_tag :div, l(Time.current, :format => format), :class => 'timestamp'} #{content_tag :div, message, :class => 'message-content'}".html_safe
+        end
+        message
+      end
+
       def active_scaffold_error_messages_for(*params)
         options = params.extract_options!.symbolize_keys
         options.reverse_merge!(:container_tag => :div, :list_type => :ul)

data/lib/active_scaffold/marked_model.rb

@@ -4,17 +4,17 @@ module ActiveScaffold
     
     def self.included(base)
       base.extend ClassMethods
-      base.scope :marked, lambda {{:conditions => {:id => base.marked_records.to_a}}}
+      base.scope :as_marked, lambda { where(:id => base.marked_records.to_a) }
     end
     
-    def marked
+    def as_marked
       marked_records.include?(self.id)
     end
     
-    def marked=(value)
+    def as_marked=(value)
       value = [true, 'true', 1, '1', 'T', 't'].include?(value.class == String ? value.downcase : value)
       if value == true
-        marked_records << self.id if !marked
+        marked_records << self.id if !as_marked
       else
         marked_records.delete(self.id)
       end

data/lib/active_scaffold/tableless.rb

@@ -25,6 +25,12 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
       end
     end
 
+    def except(*skips)
+      super.tap do |new_relation|
+        new_relation.conditions = conditions unless skips.include? :where
+      end
+    end
+
     def to_a
       @klass.find_all(self)
     end
@@ -32,6 +38,10 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
     def find_one(id)
       @klass.find_one(id, self)
     end
+
+    def execute_simple_calculation(operation, column_name, distinct)
+      @klass.execute_simple_calculation(self, operation, column_name, distinct)
+    end
   end
 
   def self.columns; @columns ||= []; end
@@ -60,6 +70,14 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
     raise 'self.find_one must be implemented in a Tableless model'
   end
 
+  def self.execute_simple_calculation(relation, operation, column_name, distinct)
+    if operation == 'count' && column_name == :all && !distinct
+      find_all(relation).size
+    else
+      raise "self.execute_simple_calculation must be implemented in a Tableless model to support #{operation} #{column_name} #{' distinct' if distinct} columns"
+    end
+  end
+
   def destroy
     raise 'destroy must be implemented in a Tableless model'
   end

data/lib/active_scaffold/version.rb

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

data/test/config/list_test.rb

@@ -25,7 +25,6 @@ class Config::ListTest < Test::Unit::TestCase
     assert_equal :filtered, @config.list.filtered_message
     assert !@config.list.always_show_create
     assert !@config.list.always_show_search
-    assert !@config.list.mark_records
     assert @config.list.count_includes.nil?
     assert_equal 'ModelStubs', @config.list.label
     assert @config.list.sorting.sorts_on?(:id)
@@ -73,11 +72,6 @@ class Config::ListTest < Test::Unit::TestCase
     assert !@config.list.sorting.sorts_on?(:id)
   end
   
-  def test_mark_records
-    @config.list.mark_records = true
-    assert @config.list.mark_records
-  end
-  
   def test_per_page
     per_page = 35
     @config.list.per_page = per_page

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 3
   - 2
-  - 11
-  version: 3.2.11
+  - 12
+  version: 3.2.12
 platform: ruby
 authors: 
 - Many, see README
@@ -15,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-24 00:00:00 Z
+date: 2012-06-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: shoulda
-  prerelease: false
+  type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,11 +28,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
+  name: shoulda
+- !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,11 +44,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :development
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
+  name: bundler
+- !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -59,11 +58,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
+  name: rcov
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -75,8 +74,9 @@ dependencies:
         - 1
         - 3
         version: 3.1.3
-  type: :runtime
   version_requirements: *id004
+  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: []
@@ -177,7 +177,7 @@ files:
 - frontends/default/views/list.html.erb
 - frontends/default/views/on_action_update.js.erb
 - frontends/default/views/on_create.js.erb
-- frontends/default/views/on_mark_all.js.erb
+- frontends/default/views/on_mark.js.erb
 - frontends/default/views/on_update.js.erb
 - frontends/default/views/refresh_list.js.erb
 - frontends/default/views/render_field.js.erb
@@ -442,7 +442,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

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

@@ -1,12 +0,0 @@
-<%options = {:checked => mark_all,
-           :include_mark_all => true}%>
-ActiveScaffold.mark_records('<%=active_scaffold_tbody_id%>',<%=options.to_json.html_safe%>);
-<%if active_scaffold_config.model.marked.length>0 then %>
-  <%if active_scaffold_config.model.marked.length < @page.pager.count then%>
-    ActiveScaffold.replace_html('<%=active_scaffold_messages_id%>','<%="#{active_scaffold_config.model.marked.length.to_s} records marked. Press <a href=\"#{url_for(:action=>"mark_all",:mark_target=>"scope")}\">here</a> to select all #{@page.pager.count} records.".html_safe%>');
-  <%else%>
-    ActiveScaffold.replace_html('<%=active_scaffold_messages_id%>','<%="All #{@page.pager.count} records marked".html_safe%>');
-  <%end%>
-<%else%>
-  ActiveScaffold.replace_html('<%=active_scaffold_messages_id%>','');
-<%end%>