active_scaffold_vho 3.1.3 → 3.1.4

data/frontends/default/views/_embedded_controller.html.erb

@@ -0,0 +1,4 @@
+<% %>
+<div id="<%=id%>" class="active-scaffold-component">
+     <%= link_to(remote_controller.to_s, url_for(url_options), {:remote => true, :class => 'as_link_to_component'}) %>
+</div>

data/frontends/default/views/_form_association_footer.html.erb

@@ -10,17 +10,15 @@ show_add_new = column_show_add_new(column, associated, @record)
 
 return unless show_add_new or show_add_existing
 
-edit_associated_url = url_for(:action => 'edit_associated', :id => parent_record.id, :association => column.name, :associated_id => '--ID--', :escape => false, :eid => params[:eid], :parent_controller => params[:parent_controller], :parent_id => params[:parent_id]) if show_add_existing
-add_new_url = url_for(:action => 'edit_associated', :id => parent_record.id, :association => column.name, :escape => false, :eid => params[:eid], :parent_controller => params[:parent_controller], :parent_id => params[:parent_id]) if show_add_new
+edit_associated_url = url_for(:action => 'edit_associated', :id => parent_record.id, :association => column.name, :associated_id => '--ID--', :escape => false, :eid => params[:eid], :parent_controller => params[:parent_controller], :parent_id => params[:parent_id]).html_safe if show_add_existing
+add_new_url = url_for(:action => 'edit_associated', :id => parent_record.id, :association => column.name, :escape => false, :eid => params[:eid], :parent_controller => params[:parent_controller], :parent_id => params[:parent_id]).html_safe if show_add_new
 
 -%>
 <div class="footer-wrapper">
   <div class="footer">
     <% if show_add_new -%>
-    <% add_label = column.plural_association? ? as_(:create_another, :model => column.association.klass.model_name.human) : as_(:replace_with_new) 
-       create_another_id = "#{sub_form_id(:association => column.name)}-create-another" %>
-    <%= tag(:input, {:id => create_another_id, :type => 'button', :value => add_label, :href => add_new_url.html_safe, 'data-remote' => true, :style=> "display: none;"}) %>
-    <%= javascript_tag("ActiveScaffold.show('#{create_another_id}');") %>
+    <% add_label = column.plural_association? ? as_(:create_another, :model => column.association.klass.model_name.human) : as_(:replace_with_new) %>
+    <%= link_to add_label, add_new_url, :class => 'as_associated_form_link', :remote => true, :style=> "display: none;" %>
     <% end -%>
 
     <%= '|' if show_add_new and show_add_existing %>
@@ -29,11 +27,9 @@ add_new_url = url_for(:action => 'edit_associated', :id => parent_record.id, :as
       <% if remote_controller and remote_controller.respond_to? :uses_record_select? and remote_controller.uses_record_select? -%>
         <%= link_to_record_select as_(:add_existing), remote_controller.controller_path, :onselect => "ActiveScaffold.record_select_onselect(#{edit_associated_url.to_json}, #{active_scaffold_id.to_json}, id);" -%>
       <% else -%>
-        <% select_options = options_for_select(options_for_association(column.association)) 
-           add_existing_id = "#{sub_form_id(:association => column.name)}-add-existing" %>
-        <%= select_tag 'associated_id', '<option value="">'.html_safe + as_(:_select_) + '</option>'.html_safe + select_options %>
-        <%= tag(:input, {:id => add_existing_id, :type => 'button', :value => as_(:add_existing), :href => edit_associated_url.html_safe, 'data-remote' => true, :class=> 'as_add_existing', :style => "display: none;"}) %>
-        <%= javascript_tag("ActiveScaffold.show('#{add_existing_id}');") %>
+        <% select_options = options_for_select(options_for_association(column.association)) %>
+        <%= select_tag 'associated_id', '<option value="">'.html_safe + as_(:_select_) + '</option>'.html_safe + select_options, :id => nil, :style => "display: none;" %>
+        <%= link_to as_(:add_existing), edit_associated_url, :remote => true, :class => 'as_associated_form_link as_add_existing', :style => "display: none;" %>
       <% end -%>
     <% end -%>
   </div>

data/frontends/default/views/_horizontal_subform_record.html.erb

@@ -5,6 +5,7 @@
    config = active_scaffold_config_for(@record.class)
    options = active_scaffold_input_options(config.columns[@record.class.primary_key], scope)
    tr_id = "association-#{options[:id]}"
+   associated_action = @record.new_record? ? :create_or_empty : :update
 %>
 <tr id="<%= tr_id %>" class="association-record <%= 'association-record-new' if @record.new_record? -%> <%= 'locked' if locked -%>">
 <% config.subform.columns.each :for => @record.class, :crud_type => crud_type, :flatten => true do |column| %>
@@ -25,13 +26,16 @@
 <% if show_actions -%>
   <td class="actions">
     <% if record_column.plural_association? and (@record.authorized_for?(:crud_type => :delete) or not [:destroy, :delete_all].include?(record_column.association.options[:dependent])) %>
-      <% destroy_id = "#{options[:id]}-destroy" %>
-      <%= link_to as_(:remove), '#', :class => 'destroy', :id => destroy_id , :onclick => "ActiveScaffold.delete_subform_record(\"#{tr_id}\"); return false;", :style=> "display: none;" %>
-      <%= javascript_tag("ActiveScaffold.show('#{destroy_id}');") if !locked %>
+      <% link_classes = ['destroy', 'as_destroy_existing']
+         link_classes << 'as_associated_form_link' if !locked %>
+      <%= link_to as_(:remove), '#', :class => link_classes.join(' '), :style=> "display: none;" %>
     <% end %>
+  </td>
+<% end -%>
+  <td>
     <% unless @record.new_record? %>
-      <input type="hidden" name="<%= options[:name] -%>" id="<%= options[:id] -%>" value="<%= @record.id -%>" />
+    <input type="hidden" name="<%= options[:name] -%>" id="<%= options[:id] -%>" value="<%= @record.id -%>" />
     <% end -%>
+    <input type="hidden" name="<%= scope ? "record#{scope}[associated_action]" : "record[associated_action]" -%>" class="associated_action" value="<%= associated_action -%>" />
   </td>
-<% end -%>
 </tr>

data/frontends/default/views/_vertical_subform_record.html.erb

@@ -6,6 +6,7 @@
   config = active_scaffold_config_for(@record.class)
   options = active_scaffold_input_options(config.columns[@record.class.primary_key], scope)
   tr_id = "association-#{options[:id]}"
+  associated_action = @record.new_record? ? :create_or_empty : :update
 -%>
 <ol id="<%= tr_id %>" class="association-record <%= 'association-record-new' if @record.new_record? -%> <%= 'locked' if locked -%>">
 <% config.subform.columns.each :for => @record, :crud_type => crud_type, :flatten => true do |column| %>
@@ -26,13 +27,16 @@
 <% if show_actions -%>
   <li class="actions">
     <% if record_column.plural_association? and (@record.authorized_for?(:crud_type => :delete) or not [:destroy, :delete_all].include?(record_column.association.options[:dependent])) %>
-      <% destroy_id = "#{options[:id]}-destroy" %>
-      <%= link_to as_(:remove), '#', :class => 'destroy', :id => destroy_id , :onclick => "ActiveScaffold.delete_subform_record(\"#{tr_id}\"); return false;", :style=> "display: none;" %>
-      <%= javascript_tag("ActiveScaffold.show('#{destroy_id}');") if !locked %>
+      <% link_classes = ['destroy', 'as_destroy_existing']
+         link_classes << 'as_associated_form_link' if !locked %>
+      <%= link_to as_(:remove), '#', :class => link_classes.join(' '), :style=> "display: none;" %>
     <% end %> 
+  </li>
+<% end -%>
+  <li>
     <% unless @record.new_record? %>
-      <input type="hidden" name="<%= options[:name] -%>" id="<%= options[:id] -%>" value="<%= @record.id -%>" />
+    <input type="hidden" name="<%= options[:name] -%>" id="<%= options[:id] -%>" value="<%= @record.id -%>" />
     <% end -%>
+    <input type="hidden" name="<%= scope ? "record#{scope}[associated_action]" : "record[associated_action]" -%>" class="associated_action" value="<%= associated_action -%>" />
   </li>
-<% end -%>
 </ol>

data/lib/active_scaffold.rb

@@ -149,6 +149,19 @@ module ActiveScaffold
     File.dirname(__FILE__) + "/.."
   end
 
+  def self.default_view_paths
+    default_paths = []
+    ActionController::Base.view_paths.each do |dir|
+        active_scaffold_override_dir = File.join(dir.to_s,"active_scaffold_overrides")
+        default_paths << active_scaffold_override_dir if File.exists?(active_scaffold_override_dir)
+    end
+    default_paths.uniq!
+
+    active_scaffold_default_frontend_path = File.join(ActiveScaffold::Config::Core.plugin_directory, 'frontends', 'default' , 'views')
+    default_paths << active_scaffold_default_frontend_path
+    default_paths
+  end
+
   module ClassMethods
     def active_scaffold(model_id = nil, &block)
       # initialize bridges here
@@ -162,20 +175,9 @@ module ActiveScaffold
       @active_scaffold_config_block = block
       self.links_for_associations
 
-      @active_scaffold_overrides = []
-      ActionController::Base.view_paths.each do |dir|
-        active_scaffold_overrides_dir = File.join(dir.to_s,"active_scaffold_overrides")
-        @active_scaffold_overrides << active_scaffold_overrides_dir if File.exists?(active_scaffold_overrides_dir)
-      end
-      @active_scaffold_overrides.uniq! # Fix rails duplicating some view_paths
-      @active_scaffold_frontends = []
       if active_scaffold_config.frontend.to_sym != :default
-        active_scaffold_custom_frontend_path = File.join(ActiveScaffold::Config::Core.plugin_directory, 'frontends', active_scaffold_config.frontend.to_s , 'views')
-        @active_scaffold_frontends << active_scaffold_custom_frontend_path
+        self.add_active_scaffold_view_path(File.join(ActiveScaffold::Config::Core.plugin_directory, 'frontends', active_scaffold_config.frontend.to_s , 'views'))
       end
-      active_scaffold_default_frontend_path = File.join(ActiveScaffold::Config::Core.plugin_directory, 'frontends', 'default' , 'views')
-      @active_scaffold_frontends << active_scaffold_default_frontend_path
-      @active_scaffold_custom_paths = []
 
       self.active_scaffold_superclasses_blocks.each {|superblock| self.active_scaffold_config.configure &superblock}
       self.active_scaffold_config.sti_children = nil # reset sti_children if set in parent block
@@ -206,7 +208,7 @@ module ActiveScaffold
           end
         end
       end
-      active_scaffold_paths.each do |path|
+      active_scaffold_view_paths.each do |path|
         self.append_view_path(ActionView::ActiveScaffoldResolver.new(path))
       end
       self._add_sti_create_links if self.active_scaffold_config.add_sti_create_links?
@@ -284,22 +286,15 @@ module ActiveScaffold
 
     def add_active_scaffold_path(path)
       @active_scaffold_paths = nil # Force active_scaffold_paths to rebuild
+      @active_scaffold_custom_paths ||= []
       @active_scaffold_custom_paths << path
     end
 
-    def add_active_scaffold_override_path(path)
-      @active_scaffold_paths = nil # Force active_scaffold_paths to rebuild
-      @active_scaffold_overrides.unshift path
-    end
-
-    def active_scaffold_paths
+    def active_scaffold_view_paths
       return @active_scaffold_paths unless @active_scaffold_paths.nil?
 
-      #@active_scaffold_paths = ActionView::PathSet.new
-      @active_scaffold_paths = []
-      @active_scaffold_paths.concat @active_scaffold_overrides unless @active_scaffold_overrides.nil?
+      @active_scaffold_paths = ActiveScaffold.default_view_paths
       @active_scaffold_paths.concat @active_scaffold_custom_paths unless @active_scaffold_custom_paths.nil?
-      @active_scaffold_paths.concat @active_scaffold_frontends unless @active_scaffold_frontends.nil?
       @active_scaffold_paths
     end
 

data/lib/active_scaffold/active_record_permissions.rb

@@ -82,8 +82,6 @@ module ActiveRecordPermissions
       # options[:column] should be the name of a model attribute
       # options[:action] is the name of a method
       def authorized_for?(options = {})
-        raise ArgumentError, "unknown crud type #{options[:crud_type]}" if options[:crud_type] and ![:create, :read, :update, :delete].include?(options[:crud_type])
-
         # column_authorized_for_crud_type? has the highest priority over other methods,
         # you can disable a crud verb and enable that verb for a column
         # (for example, disable update and enable inplace_edit in a column)

data/lib/active_scaffold/attribute_params.rb

@@ -87,7 +87,7 @@ module ActiveScaffold
     end
     
     def manage_nested_record_from_params(parent_record, column, attributes)
-      record = find_or_create_for_params(attributes, column, parent_record)
+      record = nested_record_for_action(parent_record, column, attributes)
       if record
         record_columns = active_scaffold_config_for(column.association.klass).subform.columns
         update_record_from_params(record, record_columns, attributes)
@@ -95,6 +95,23 @@ module ActiveScaffold
       end
       record
     end
+
+    def nested_record_for_action(parent_record, column, attributes)
+      associated_action = attributes.delete(:associated_action)
+
+      case associated_action.to_sym
+      when :create then create_nested_record(column, parent_record)
+      when :update then find_nested_record(attributes[:id], column, parent_record)
+      when :empty then nil
+      when :delete then nil
+      when :create_or_empty then
+        if column.show_blank_record && attributes_hash_is_empty?(attributes, column.association.klass)
+          nil
+        else
+          create_nested_record(column, parent_record)
+        end
+      end
+    end
     
     def column_value_from_param_value(parent_record, column, value)
       # convert the value, possibly by instantiating associated objects
@@ -149,33 +166,34 @@ module ActiveScaffold
       end
     end
 
-    # Attempts to create or find an instance of klass (which must be an ActiveRecord object) from the
-    # request parameters given. If params[:id] exists it will attempt to find an existing object
-    # otherwise it will build a new one.
-    def find_or_create_for_params(params, parent_column, parent_record)
-      current = parent_record.send(parent_column.name)
+    def create_nested_record(parent_column, parent_record)
       klass = parent_column.association.klass
-      return nil if parent_column.show_blank_record and attributes_hash_is_empty?(params, klass)
+      
+      if klass.authorized_for?(:crud_type => :create)
+        if parent_column.singular_association?
+          return parent_record.send("build_#{parent_column.name}")
+        else
+          return parent_record.send(parent_column.name).build
+        end
+      end
+    end
 
-      if params.has_key? :id
+    def find_nested_record(id, parent_column, parent_record)
+      klass = parent_column.association.klass
+      if id
+        current = parent_record.send(parent_column.name)
         # modifying the current object of a singular association
-        if current and current.is_a? ActiveRecord::Base and current.id.to_s == params[:id]
+        if current && current.is_a?(ActiveRecord::Base) && current.id.to_s == id
           return current
         # modifying one of the current objects in a plural association
-        elsif current and current.respond_to?(:any?) and current.any? {|o| o.id.to_s == params[:id]}
-          return current.detect {|o| o.id.to_s == params[:id]}
+        elsif current && current.respond_to?(:any?) && current.any? {|o| o.id.to_s == id}
+          return current.detect {|o| o.id.to_s == id}
         # attaching an existing but not-current object
         else
-          return klass.find(params[:id])
+          return klass.find(id)
         end
       else
-        if klass.authorized_for?(:crud_type => :create)
-          if parent_column.singular_association?
-            return parent_record.send("build_#{parent_column.name}")
-          else
-            return parent_record.send(parent_column.name).build
-          end
-        end
+        Rails.logger.info("Activescaffold find_nested_record missing id")
       end
     end
 

data/lib/active_scaffold/data_structures/action_link.rb

@@ -67,16 +67,7 @@ module ActiveScaffold::DataStructures
     def confirm?
       @confirm ? true : false
     end
-    
-    # if the action uses a DHTML based (i.e. 2-phase) confirmation
-    attr_writer :dhtml_confirm
-    def dhtml_confirm
-      @dhtml_confirm
-    end
-    def dhtml_confirm?
-      @dhtml_confirm
-    end
-
+   
     # what method to call on the controller to see if this action_link should be visible
     # note that this is only the UI part of the security. to prevent URL hax0rz, you also need security on requests (e.g. don't execute update method unless authorized).
     attr_writer :security_method

data/lib/active_scaffold/extensions/action_view_rendering.rb

@@ -109,15 +109,19 @@ module ActionView #:nodoc:
       if context.controller.respond_to?(:render_component_into_view)
         context.controller.send(:render_component_into_view, url_options)
       else
-        content_tag(:div, {:id => id, :class => 'active-scaffold-component'}) do
-          url = url_for(url_options)
-          link_to(remote_controller.to_s, url, {:remote => true, :id => id}) <<
-            if ActiveScaffold.js_framework == :prototype
-            javascript_tag("new Ajax.Updater('#{id}', '#{url}', {method: 'get', evalScripts: true});")
-          elsif ActiveScaffold.js_framework == :jquery
-            javascript_tag("$('##{id}').load('#{url}');")
+        if !context.controller.respond_to?(:uses_active_scaffold?) || context.controller.send(:uses_active_scaffold?) == false
+          # have to add activescaffold view path cause parentcontroller is not activescaffold enabled
+          ActiveScaffold.default_view_paths.each do |path|
+            context.controller.append_view_path(ActionView::ActiveScaffoldResolver.new(path))
           end
         end
+        url_options.delete(:embedded)
+        options[:locals] ||= {}
+        options[:locals].merge!({:url_options => url_options, :id=> id, :remote_controller => remote_controller})
+        options[:partial] = 'embedded_controller'
+        options.delete(:active_scaffold)
+        options.delete(:params)
+        render(context, options)
       end
     end
 

data/lib/active_scaffold/extensions/unsaved_associated.rb

@@ -48,7 +48,7 @@ class ActiveRecord::Base
   # returns true otherwise, even when none of the associations have been instantiated. build wrapper methods accordingly.
   def with_unsaved_associated
     associations_for_update.all? do |association|
-      association_proxy = instance_variable_get("@#{association.name}")
+      association_proxy = send(association.name)
       if association_proxy
         records = association_proxy
         records = [records] unless records.is_a? Array # convert singular associations into collections for ease of use

data/lib/active_scaffold/finder.rb

@@ -275,6 +275,8 @@ module ActiveScaffold
       # Converts count to an integer if ActiveRecord returned an OrderedHash
       # that happens when finder_options contains a :group key
       count = count.length if count.is_a? ActiveSupport::OrderedHash
+
+      full_includes = add_association_to_includes_for_sorting(options[:sorting], full_includes)
       finder_options.merge! :includes => full_includes
 
       # we build the paginator differently for method- and sql-based sorting
@@ -292,6 +294,21 @@ module ActiveScaffold
       end
       pager.page(options[:page])
     end
+
+    # if someone excludes association from includes in configuration
+    # and sorts by that that column... database will not be happy about it :-)
+    # just a safety check to prevent many many database queries
+    def add_association_to_includes_for_sorting(sorting, full_includes)
+      if sorting && sorting.sorts_by_method?
+        sorting_column = sorting.first.first
+        #wants to sort by assocation which is not included bad performance...
+        if sorting_column.association && !sorting_column.polymorphic_association? &&
+           sorting_column.includes.empty? && !full_includes.include?(sorting_column.association.name)
+           full_includes << sorting_column.association.name
+        end
+      end
+      full_includes
+    end
     
     def append_to_query(query, options)
       options.assert_valid_keys :where, :select, :group, :order, :limit, :offset, :joins, :includes, :lock, :readonly, :from

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -353,15 +353,15 @@ module ActiveScaffold
 
       def render_nested_view(action_links, url_options, record)
         rendered = []
-        link_id = nil
+        link_nested_controllers = []
         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)
             link_url_options = {:embedded => true, :format => :js}.merge(action_link_url_options(link, url_options, record, options = {:reuse_eid => true}))
-            link_id = get_action_link_id(link_url_options, record, link.column)
+            link_nested_controllers << link.controller.to_s if link.controller
             rendered << (controller.send(:render_component_into_view, link_url_options))
           end
         end
-        content_tag(:tr, content_tag(:td, rendered.join(' ').html_safe), :class => "inline-adapter-autoopen", 'data-actionlinkid' => link_id, 'data-as_load'=>"tr");
+        content_tag(:tr, content_tag(:td, rendered.join(' ').html_safe), :class => "inline-adapter-autoopen", 'data-actionlink-controllers' => link_nested_controllers.join('::').html_safe, 'data-as_load'=>"tr");
       end
     end
   end

data/lib/active_scaffold/helpers/pagination_helpers.rb

@@ -24,7 +24,7 @@ module ActiveScaffold
               page = current_page.number - offset
               if page < start_number && page > 1
                 html << '..' if page > last_page + 1
-                html << pagination_ajax_link(page, params)
+                html << pagination_ajax_link(page, params, options)
                 last_page = page
               end
             end

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -166,7 +166,6 @@ module ActiveScaffold
       end
       
       def action_link_html_options(link, url_options, record, html_options)
-        link_id = get_action_link_id(url_options, record, link.column)
         html_options.reverse_merge! link.html_options.merge(:class => link.action)
 
         # Needs to be in html_options to as the adding _method to the url is no longer supported by Rails        
@@ -181,14 +180,7 @@ module ActiveScaffold
           html_options['data-popup'] = true
           html_options[:target] = '_blank'
         end
-        html_options[:id] = link_id
         html_options[:remote] = true unless link.page? || link.popup?
-        if link.dhtml_confirm?
-          html_options[:class] += ' as_action' if !link.inline?
-          html_options[:page_link] = 'true' if !link.inline?
-          html_options[:dhtml_confirm] = link.dhtml_confirm.value
-          html_options[:onclick] = link.dhtml_confirm.onclick_function(controller, link_id)
-        end
         html_options[:class] += " #{link.html_options[:class]}" unless link.html_options[:class].blank?
         html_options
       end
@@ -256,6 +248,7 @@ module ActiveScaffold
       end
 
       def column_class(column, column_value, record)
+        @numeric_classes ||= [:decimal, :float, :integer]
         classes = []
         classes << "#{column.name}-column"
         if column.css_class.is_a?(Proc)
@@ -267,7 +260,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 << 'numeric' if column.column && @numeric_classes.include?(column.column.type)
         classes.join(' ').rstrip
       end
       
@@ -286,9 +279,10 @@ module ActiveScaffold
       end
 
       def column_empty?(column_value)
+        @empty_column_strings ||= ['&nbsp;', active_scaffold_config.list.empty_field_text]
         empty = column_value.nil?
         empty ||= column_value.empty? if column_value.respond_to? :empty?
-        empty ||= ['&nbsp;', active_scaffold_config.list.empty_field_text].include? column_value if String === column_value
+        empty ||= @empty_column_strings.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 = 1
-    PATCH = 3
+    PATCH = 4
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end