active_scaffold 3.3.0 → 3.3.1

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -41,7 +41,7 @@ module ActiveScaffold
       # TODO: move empty_field_text and   logic in here?
       # TODO: we need to distinguish between the automatic links *we* create and the ones that the dev specified. some logic may not apply if the dev specified the link.
       def render_list_column(text, column, record)
-        if column.link
+        if column.link && !skip_action_link?(column.link, record)
           link = column.link
           associated = record.send(column.association.name) if column.association
           render_action_link(link, record, :link => text, :authorized => link.action.nil? || column_link_authorized?(link, column, record, associated))
@@ -200,7 +200,7 @@ module ActiveScaffold
 
       def inplace_edit?(record, column)
         if column.inplace_edit
-          editable = controller.send(:update_authorized?, record) if controller.respond_to?(:update_authorized?)
+          editable = controller.send(:update_authorized?, record) if controller.respond_to?(:update_authorized?, true)
           editable ||= record.authorized_for?(:crud_type => :update, :column => column.name)
         end
       end
@@ -222,11 +222,11 @@ module ActiveScaffold
 
       def inplace_edit_control(column)
         if inplace_edit?(active_scaffold_config.model, column) and inplace_edit_cloning?(column)
-          old_record, @record = @record, new_model
+          old_record, @record = @record, new_model # TODO remove when relying on @record is removed
           column = column.clone
           column.options = column.options.clone
           column.form_ui = :select if (column.association && column.form_ui.nil?)
-          options = active_scaffold_input_options(column)
+          options = active_scaffold_input_options(column).merge(:object => new_model)
           options[:class] = "#{options[:class]} inplace_field"
           content_tag(:div, active_scaffold_input_for(column, nil, options), :style => "display:none;", :class => inplace_edit_control_css_class).tap do
             @record = old_record
@@ -302,6 +302,9 @@ module ActiveScaffold
                      :remote => true, :method => :get}
           url_options = params_for(:action => :index, :page => 1,
                            :sort => column.name, :sort_direction => sort_direction)
+          unless active_scaffold_config.store_user_settings
+            url_options.merge!(:search => search_params) if search_params.present?
+          end
           link_to column_heading_label(column), url_options, options
         else
           content_tag(:p, column_heading_label(column))
@@ -315,7 +318,7 @@ module ActiveScaffold
       def render_nested_view(action_links, record)
         rendered = []
         action_links.member.each do |link|
-          if link.nested_link? && link.column && @nested_auto_open[link.column.name] && @records.length <= @nested_auto_open[link.column.name] && controller.respond_to?(:render_component_into_view)
+          if link.nested_link? && link.column && @nested_auto_open[link.column.name] && @records.length <= @nested_auto_open[link.column.name] && controller.respond_to?(:render_component_into_view, true)
             link_url_options = {:adapter => '_list_inline_adapter', :format => :js}.merge(action_link_url_options(link, record))
             link_id = get_action_link_id(link, record)
             rendered << (controller.send(:render_component_into_view, link_url_options) + javascript_tag("ActiveScaffold.ActionLink.get('#{link_id}').set_opened();"))

data/lib/active_scaffold/helpers/pagination_helpers.rb

@@ -6,6 +6,14 @@ module ActiveScaffold
       end
 
       def pagination_ajax_links(current_page, url_options, options, inner_window, outer_window)
+        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?
+            column, direction = active_scaffold_config.list.user.sorting.first
+            url_options.merge!(:sort => column.name, :sort_direction => direction)
+          end
+        end
+
         start_number = current_page.number - inner_window
         end_number = current_page.number + inner_window
         start_number = 1 if start_number <= 0

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -4,12 +4,12 @@ module ActiveScaffold
     module SearchColumnHelpers
       # This method decides which input to use for the given column.
       # It does not do any rendering. It only decides which method is responsible for rendering.
-      def active_scaffold_search_for(column)
-        options = active_scaffold_search_options(column)
+      def active_scaffold_search_for(column, options = nil)
+        options ||= active_scaffold_search_options(column)
 
         # first, check if the dev has created an override for this specific field for search
         if (method = override_search_field(column))
-          send(method, @record, options)
+          send(method, options[:object] || @record, options)
 
         # second, check if the dev has specified a valid search_ui for this column, using specific ui for searches
         elsif column.search_ui and (method = override_search(column.search_ui))
@@ -21,7 +21,7 @@ module ActiveScaffold
 
         # fourth, check if the dev has created an override for this specific field
         elsif (method = override_form_field(column))
-          send(method, @record, options)
+          send(method, options[:object] || @record, options)
 
         # fallback: we get to make the decision
         else
@@ -51,6 +51,16 @@ module ActiveScaffold
         { :name => "search[#{column.name}]", :class => "#{column.name}-input", :id => "search_#{column.name}", :value => field_search_params[column.name] }
       end
 
+      def search_attribute(column, record)
+        column_options = active_scaffold_search_options(column).merge(:object => record)
+        field = active_scaffold_search_for column, column_options
+        %|<dl><dt>#{label_tag search_label_for(column, column_options), search_column_label(column, record)}</dt><dd>#{field}</dd></dl>|.html_safe
+      end
+
+      def search_label_for(column, options)
+        options[:id] unless [:range, :integer, :decimal, :float, :string, :date_picker, :datetime_picker, :calendar_date_select].include? column.search_ui
+      end
+      
       ##
       ## Search input methods
       ##
@@ -114,7 +124,7 @@ module ActiveScaffold
         select_options << [as_(:true), true]
         select_options << [as_(:false), false]
 
-        select_tag(options[:name], options_for_select(select_options, column.column.type_cast(field_search_params[column.name])))
+        select_tag(options[:name], options_for_select(select_options, column.column.type_cast(field_search_params[column.name])), :id => options[:id])
       end
       # we can't use checkbox ui because it's not possible to decide whether search for this field or not
       alias_method :active_scaffold_search_checkbox, :active_scaffold_search_boolean
@@ -123,7 +133,7 @@ module ActiveScaffold
         select_options = []
         select_options << [as_(:_select_), nil]
         select_options.concat ActiveScaffold::Finder::NullComparators.collect {|comp| [as_(comp), comp]}
-        select_tag(options[:name], options_for_select(select_options, field_search_params[column.name]))
+        select_tag(options[:name], options_for_select(select_options, field_search_params[column.name]), :id => options[:id])
       end
 
       def field_search_params_range_values(column)
@@ -223,6 +233,10 @@ module ActiveScaffold
       ##
       ## Search column override signatures
       ##
+      
+      def search_column_label(column, record)
+        column.label
+      end
 
       def override_search_field(column)
         override_helper column, 'search_column'

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -97,11 +97,11 @@ module ActiveScaffold
       end
 
       def skip_action_link?(link, *args)
-        !link.ignore_method.nil? && controller.respond_to?(link.ignore_method) && controller.send(link.ignore_method, *args)
+        !link.ignore_method.nil? && controller.respond_to?(link.ignore_method, true) && controller.send(link.ignore_method, *args)
       end
 
       def action_link_authorized?(link, *args)
-        security_method = link.security_method_set? || controller.respond_to?(link.security_method)
+        security_method = link.security_method_set? || controller.respond_to?(link.security_method, true)
         authorized = if security_method
           controller.send(link.security_method, *args)
         else
@@ -224,8 +224,8 @@ module ActiveScaffold
           authorized = associated_for_authorized.authorized_for?(:crud_type => link.crud_type)
           authorized = authorized and record.authorized_for?(:crud_type => :update, :column => column.name) if link.crud_type == :create
           authorized
-        else
-          record.authorized_for?(:crud_type => link.crud_type)
+        else 
+          action_link_authorized?(link, record)
         end
       end
 
@@ -368,7 +368,7 @@ module ActiveScaffold
             id = "#{column.association.name}-#{record.id}" unless record.nil?
           end
         end
-        action_id = "#{id_from_controller("#{link.controller}-") if params[:parent_controller] || link.controller != controller.controller_path}#{link.action}"
+        action_id = "#{id_from_controller("#{link.controller}-") if params[:parent_controller] || (link.controller && link.controller != controller.controller_path)}#{link.action}"
         action_link_id(action_id, id)
       end
       
@@ -462,7 +462,7 @@ module ActiveScaffold
 
       def column_empty?(column_value)
         empty = column_value.nil?
-        empty ||= column_value.blank?
+        empty ||= column_value != false && column_value.blank?
         empty ||= [' ', active_scaffold_config.list.empty_field_text].include? column_value if String === column_value
         return empty
       end

data/lib/active_scaffold/version.rb

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

data/test/bridges/paperclip_test.rb

@@ -29,8 +29,8 @@ class PaperclipTest < ActionView::TestCase
     %w(logo_file_name logo_file_size logo_updated_at logo_content_type).each do |attr|
       assert !config.columns._inheritable.include?(attr.to_sym)
     end
-    assert Company.instance_methods.include?('delete_logo')
-    assert Company.instance_methods.include?('delete_logo=')
+    assert Company.method_defined?(:delete_logo)
+    assert Company.method_defined?(:'delete_logo=')
   end
 
   def test_delete

data/vendor/assets/javascripts/getprototypeof.js

@@ -0,0 +1,12 @@
+if ( typeof Object.getPrototypeOf !== "function" ) {
+  if ( typeof "test".__proto__ === "object" ) {
+    Object.getPrototypeOf = function(object){
+      return object.__proto__;
+    };
+  } else {
+    Object.getPrototypeOf = function(object){
+      // May break if the constructor has been tampered with
+      return object.constructor.prototype;
+    };
+  }
+}

data/vendor/assets/javascripts/jquery-ui-timepicker-addon.js

@@ -163,7 +163,7 @@
 
       for (var attrName in this._defaults) {
         if(this._defaults.hasOwnProperty(attrName)){
-          var attrValue = $input.attr('time:' + attrName);
+          var attrValue = $input.data(attrName.toLowerCase());
           if (attrValue) {
             try {
               inlineSettings[attrName] = eval(attrValue);

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 3
   - 3
-  - 0
-  version: 3.3.0
+  - 1
+  version: 3.3.1
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-08 00:00:00 Z
+date: 2013-06-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -146,7 +146,6 @@ files:
 - app/views/active_scaffold_overrides/_render_field.js.erb
 - app/views/active_scaffold_overrides/_row.html.erb
 - app/views/active_scaffold_overrides/_search.html.erb
-- app/views/active_scaffold_overrides/_search_attribute.html.erb
 - app/views/active_scaffold_overrides/_show.html.erb
 - app/views/active_scaffold_overrides/_show_columns.html.erb
 - app/views/active_scaffold_overrides/_update_actions.html.erb
@@ -326,6 +325,7 @@ files:
 - vendor/assets/images/ui-icons_ef8c08_256x240.png
 - vendor/assets/images/ui-icons_ffd27a_256x240.png
 - vendor/assets/images/ui-icons_ffffff_256x240.png
+- vendor/assets/javascripts/getprototypeof.js
 - vendor/assets/javascripts/jquery-ui-timepicker-addon.js
 - vendor/assets/stylesheets/jquery-ui.css
 - MIT-LICENSE

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

@@ -1,10 +0,0 @@
-<li class="form-element">
-    <dl>
-      <dt>
-        <label for="<%= "search_#{column.name}" %>"><%= column.label %></label>
-      </dt>
-    <dd>
-    <%= active_scaffold_search_for(column) %>
-    </dd>
-  </dl>
-</li>