active_scaffold_vho 3.0.19 → 3.0.20

data/active_scaffold_vho.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_scaffold_vho}
-  s.version = "3.0.19"
+  s.version = "3.0.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Many, see README"]
-  s.date = %q{2011-04-18}
+  s.date = %q{2011-05-27}
   s.description = %q{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.}
   s.email = %q{activescaffold@googlegroups.com}
   s.extra_rdoc_files = [

data/frontends/default/javascripts/jquery/active_scaffold.js

@@ -160,7 +160,11 @@ $(document).ready(function() {
         params = as_form.serialize();
         params += '&' + $.param({source_id: element.attr('id')});
       } else {
-        params = {value: element.val()};
+        if (element.is("input:checkbox")) {
+          params = {value: element.is(":checked")};
+        } else {
+          params = {value: element.val()};
+        }
         params.source_id = element.attr('id');
       }
 
@@ -593,7 +597,7 @@ var ActiveScaffold = {
   },
   
   highlight: function(element) {
-    if (typeof(element) == 'string') element = '#' + element;
+    if (typeof(element) == 'string') element = $('#' + element);
     if (typeof(element.effect) == 'function') {
       element.effect("highlight", {}, 3000);
     }

data/frontends/default/stylesheets/stylesheet.css

@@ -997,8 +997,8 @@ font-size: 100%;
 }
 
 .as_touch a.inline-adapter-close {
-width: 32px;
-height: 34px;
+width: 25px;
+height: 27px;
 background: url(../../../images/active_scaffold/default/close_touch.png) 0 0 no-repeat;
 }
 

data/frontends/default/views/on_action_update.js.rjs

@@ -1,8 +1,10 @@
-page.call 'ActiveScaffold.replace_html', active_scaffold_messages_id, render(:partial => 'messages')
 if controller.send :successful?
+  page.call 'ActiveScaffold.replace_html', active_scaffold_messages_id, render(:partial => 'messages')
   page.call 'ActiveScaffold.update_row', element_row_id(:action => :list, :id => @record.id), render(:partial => 'list_record', :locals => {:record => @record}) if @record
   page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}
 else
+  flash[:error] = active_scaffold_error_messages_for(@record, :object_name => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :header_message => '', :message => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :container_tag => nil, :list_type => :br)
+  page.call 'ActiveScaffold.replace_html', active_scaffold_messages_id, render(:partial => 'messages')
   page.call 'ActiveScaffold.scroll_to', active_scaffold_messages_id
 end
 

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

@@ -1,4 +1,12 @@
 options = {:checked => mark_all,
            :include_mark_all => true}
 page << "ActiveScaffold.mark_records('#{active_scaffold_tbody_id}', #{options.to_json});"
-
+if active_scaffold_config.model.marked.length>0 then
+  if active_scaffold_config.model.marked.length < @page.pager.count then
+    page.call '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
+    page.call 'ActiveScaffold.replace_html', active_scaffold_messages_id, "All #{@page.pager.count} records marked"
+  end
+else
+  page.call 'ActiveScaffold.replace_html', active_scaffold_messages_id, ""
+end

data/lib/active_scaffold.rb

@@ -237,9 +237,9 @@ module ActiveScaffold
       end
     end
     
-    def link_for_association(column, options = {})
+    def active_scaffold_controller_for_column(column, options = {})
       begin
-        controller = if column.polymorphic_association?
+        if column.polymorphic_association?
           :polymorph
         elsif options.include?(:controller)
           "#{options[:controller].to_s.camelize}Controller".constantize
@@ -247,8 +247,12 @@ module ActiveScaffold
           active_scaffold_controller_for(column.association.klass)
         end
       rescue ActiveScaffold::ControllerNotFound
-        controller = nil        
+        nil        
       end
+    end
+    
+    def link_for_association(column, options = {})
+      controller = active_scaffold_controller_for_column(column, options)
       
       unless controller.nil?
         options.reverse_merge! :label => column.label, :position => :after, :type => :member, :controller => (controller == :polymorph ? controller : controller.controller_path), :column => column

data/lib/active_scaffold/actions/list.rb

@@ -65,14 +65,14 @@ module ActiveScaffold::Actions
       self.active_scaffold_includes.concat includes_for_list_columns
 
       options = { :sorting => active_scaffold_config.list.user.sorting,
-                  :count_includes => active_scaffold_config.list.user.count_includes }
+        :count_includes => active_scaffold_config.list.user.count_includes }
       paginate = (params[:format].nil?) ? (accepts? :html, :js) : ['html', 'js'].include?(params[:format])
       if paginate
         options.merge!({
-          :per_page => active_scaffold_config.list.user.per_page,
-          :page => active_scaffold_config.list.user.page, 
-          :pagination => active_scaffold_config.list.pagination
-        })
+            :per_page => active_scaffold_config.list.user.per_page,
+            :page => active_scaffold_config.list.user.page,
+            :pagination => active_scaffold_config.list.pagination
+          })
       end
 
       page = find_page(options);
@@ -83,11 +83,19 @@ module ActiveScaffold::Actions
       @page, @records = page, page.items
     end
 
+    def each_record_in_page
+      _page = active_scaffold_config.list.user.page
+      do_search if respond_to? :do_search
+      active_scaffold_config.list.user.page = _page
+      do_list
+      @page.items.each {|record| yield record}
+    end
+
     def each_record_in_scope
       do_search if respond_to? :do_search
       finder_options = { :order => "#{active_scaffold_config.model.connection.quote_table_name(active_scaffold_config.model.table_name)}.#{active_scaffold_config.model.primary_key} ASC",
-                         :conditions => all_conditions,
-                         :joins => joins_for_finder}
+        :conditions => all_conditions,
+        :joins => joins_for_finder}
       finder_options.merge! custom_finder_options
       finder_options.merge! :include => (active_scaffold_includes.blank? ? nil : active_scaffold_includes)
       klass = beginning_of_chain

data/lib/active_scaffold/actions/mark.rb

@@ -8,14 +8,14 @@ module ActiveScaffold::Actions
     end
 
     def mark_all
-      if mark_all?
+      if mark_all? || mark_all_scope_forced?
         do_mark_all
       else
         do_demark_all
       end
       respond_to_action(:mark_all)
     end
- protected
+    protected
 
     def mark_all_respond_to_html
       do_list
@@ -42,12 +42,24 @@ module ActiveScaffold::Actions
       @mark_all ||= [true, 'true', 1, '1', 'T', 't'].include?(params[:value].class == String ? params[:value].downcase : params[:value])
     end
 
+    def mark_all_scope_forced?
+      !params[:mark_target].nil? && params[:mark_target]=='scope'
+    end
+    
     def do_mark_all
-      each_record_in_scope {|record| marked_records << record.id}
+      if active_scaffold_config.mark.mark_all_mode == :page && !mark_all_scope_forced? then
+        each_record_in_page {|record| marked_records << record.id}
+      else
+        each_record_in_scope {|record| marked_records << record.id}
+      end
     end
 
     def do_demark_all
-      each_record_in_scope {|record| marked_records.delete(record.id)}
+      if active_scaffold_config.mark.mark_all_mode == :page then
+        each_record_in_page {|record| marked_records.delete(record.id)}
+      else
+        each_record_in_scope {|record| marked_records.delete(record.id)}
+      end
     end
     
     # The default security delegates to ActiveRecordPermissions.

data/lib/active_scaffold/actions/nested.rb

@@ -19,7 +19,7 @@ module ActiveScaffold::Actions
     def nested
       @nested ||= ActiveScaffold::DataStructures::NestedInfo.get(active_scaffold_config.model, active_scaffold_session_storage)
       if !@nested.nil? && @nested.new_instance?
-        register_constraints_with_action_columns(@nested.constrained_fields)
+        register_constraints_with_action_columns(@nested.constrained_fields,  active_scaffold_config.list.hide_nested_column ? [] : [:list])
         active_scaffold_constraints[:id] = params[:id] if @nested.belongs_to?
       end
       @nested

data/lib/active_scaffold/config/list.rb

@@ -114,6 +114,12 @@ module ActiveScaffold::Config
     def always_show_create
       @always_show_create && @core.actions.include?(:create)
     end
+
+    # if list view is nested hide nested_column
+    attr_writer :hide_nested_column
+    def hide_nested_column
+      @hide_nested_column.nil? ? true : @hide_nested_column
+    end
     
     # might be set to open nested_link automatically in view
     # conf.nested.add_link(:players)

data/lib/active_scaffold/config/mark.rb

@@ -1,11 +1,24 @@
 module ActiveScaffold::Config
   class Mark < Base
     self.crud_type = :read
+
+    # What kind of mark all mode to use:
+    # * :search: de-/mark all records using current search conditions
+    # * :page: de-/mark all records on current page
+    cattr_accessor :mark_all_mode
+    @@mark_all_mode = :search
+
+    attr_accessor :mark_all_mode
     
     def initialize(core_config)
       @core = core_config
-      @core.model.send(:include, ActiveScaffold::MarkedModel) unless @core.model.ancestors.include?(ActiveScaffold::MarkedModel)
-      add_mark_column
+      @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
     end
     
     protected

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -313,7 +313,14 @@ module ActiveScaffold
       end
 
       def mark_column_heading
-        all_marked = (marked_records.length >= @page.pager.count)
+        if active_scaffold_config.mark.mark_all_mode == :page then
+          all_marked = true
+          @page.items.each do |record|
+            all_marked = false if !marked_records.entries.include?(record.id)
+          end
+        else
+          all_marked = (marked_records.length >= @page.pager.count)
+        end
         tag_options = {:id => "#{controller_id}_mark_heading", :class => "mark_heading in_place_editor_field"}
         tag_options['data-ie_url'] = url_for({:controller => params_for[:controller], :action => 'mark_all', :eid => params[:eid]})
         content_tag(:span, check_box_tag("#{controller_id}_mark_heading_span_input", !all_marked, all_marked), tag_options)

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -122,9 +122,13 @@ module ActiveScaffold
         
       end
 
+      def active_scaffold_search_range_string?(column)
+        (column.column && column.column.text?) || column.search_ui == :string
+      end
+
       def active_scaffold_search_range_comparator_options(column)
         select_options = ActiveScaffold::Finder::NumericComparators.collect {|comp| [as_(comp.downcase.to_sym), comp]}
-        if column.column && column.column.text?
+        if active_scaffold_search_range_string?(column)
           select_options.unshift *ActiveScaffold::Finder::StringComparators.collect {|title, comp| [as_(title), comp]}
         end
         select_options
@@ -134,7 +138,7 @@ module ActiveScaffold
         opt_value, from_value, to_value = field_search_params_range_values(column)
 
         select_options = active_scaffold_search_range_comparator_options(column)
-        if column.column && column.column.text?
+        if active_scaffold_search_range_string?(column)
           text_field_size = 15
           opt_value ||= '%?%'
         else

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -148,7 +148,7 @@ module ActiveScaffold
       def action_link_url_options(link, url_options, record, options = {})
         url_options = url_options.clone
         url_options[:action] = link.action
-        url_options[:controller] = link.controller if link.controller
+        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
@@ -228,10 +228,15 @@ module ActiveScaffold
       def url_options_for_sti_link(column, record, link, url_options, options = {})
         #need to find out controller of current record type
         #and set parameters
-        sti_controller_path = controller_path_for_activerecord(record.class)
-        if sti_controller_path
-          url_options[:controller] = sti_controller_path
-          url_options[:parent_sti] = controller_path
+        # its quite difficult to detect an sti link
+        # if link.column.nil? we are sure that it is nt an singular association inline autolink
+        # howver that will not work if a sti parent is an singular association inline autolink
+        if link.column.nil?
+          sti_controller_path = controller_path_for_activerecord(record.class)
+          if sti_controller_path
+            url_options[:controller] = sti_controller_path
+            url_options[:parent_sti] = controller_path
+          end
         end
       end
 

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 47
   prerelease: false
   segments: 
   - 3
   - 0
-  - 19
-  version: 3.0.19
+  - 20
+  version: 3.0.20
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 +02:00
+date: 2011-05-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency