active_scaffold 3.1.17 → 3.1.18

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

@@ -25,9 +25,9 @@ options['data-loading'] = true unless live_search
     $(element).next().click();
   });
 <% elsif live_search && ActiveScaffold.js_framework == :jquery %>
-  $(<%= "##{search_input_id}".to_json.html_safe %>).next().hide();
-  $(<%= "##{search_input_id}".to_json.html_safe %>).delayedObserver(0.5, function() {
-     $(<%= "##{search_input_id}".to_json.html_safe %>).parent().trigger("submit");});
+  jQuery(<%= "##{search_input_id}".to_json.html_safe %>).next().hide();
+  jQuery(<%= "##{search_input_id}".to_json.html_safe %>).delayedObserver(0.5, function() {
+     jQuery(<%= "##{search_input_id}".to_json.html_safe %>).parent().trigger("submit");});
 <% end -%>
 ActiveScaffold.focus_first_element_of_form('<%= element_form_id(:action => 'search') %>');
 //]]>

data/lib/active_scaffold/actions/nested.rb

@@ -5,8 +5,8 @@ module ActiveScaffold::Actions
     def self.included(base)
       super
       base.module_eval do
-        before_filter :register_constraints_with_action_columns
-        before_filter :set_nested
+        #before_filter :register_constraints_with_action_columns
+        prepend_before_filter :set_nested
         before_filter :configure_nested
         include ActiveScaffold::Actions::Nested::ChildMethods if active_scaffold_config.model.reflect_on_all_associations.any? {|a| a.macro == :has_and_belongs_to_many}
       end

data/lib/active_scaffold/actions/nested.rb~

@@ -5,9 +5,10 @@ module ActiveScaffold::Actions
     def self.included(base)
       super
       base.module_eval do
-        before_filter :register_constraints_with_action_columns
-        before_filter :set_nested
+        #before_filter :register_constraints_with_action_columns
+        prepend_before_filter :set_nested
         before_filter :configure_nested
+        debugger
         include ActiveScaffold::Actions::Nested::ChildMethods if active_scaffold_config.model.reflect_on_all_associations.any? {|a| a.macro == :has_and_belongs_to_many}
       end
       base.before_filter :include_habtm_actions
@@ -31,7 +32,6 @@ module ActiveScaffold::Actions
           active_scaffold_constraints[:id] = params[:id] if @nested.belongs_to?
           register_constraints_with_action_columns(@nested.constrained_fields,  active_scaffold_config.list.hide_nested_column ? [] : [:list])
         end
-        #params.delete_if {|key, value| [:parent_scaffold, :association, :named_scope, :assoc_id].include? key.to_sym}
       end
     end
     

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -117,8 +117,12 @@ module ActiveScaffold::DataStructures
         end
         if association.foreign_key == current.foreign_key
           # show columns for has_many and has_one child associationes
-          constrained_fields << current.name.to_sym if current.belongs_to? 
-          @child_association = current if current.klass == @parent_model
+          constrained_fields << current.name.to_sym if current.belongs_to?
+          if association.options[:as] and current.options[:polymorphic]
+            @child_association = current if association.options[:as].to_sym == current.name
+          else
+            @child_association = current if current.klass == @parent_model
+          end
         end
       end
     end

data/lib/active_scaffold/data_structures/nested_info.rb~

@@ -109,17 +109,21 @@ module ActiveScaffold::DataStructures
     
     def iterate_model_associations(model)
       @constrained_fields = []
-          debugger
       @constrained_fields << association.foreign_key.to_sym unless association.belongs_to?
       model.reflect_on_all_associations.each do |current|
+        debugger
         if !current.belongs_to? && association.foreign_key == current.association_foreign_key
           constrained_fields << current.name.to_sym
           @child_association = current if current.klass == @parent_model
         end
         if association.foreign_key == current.foreign_key
           # show columns for has_many and has_one child associationes
-          constrained_fields << current.name.to_sym if current.belongs_to? 
-          @child_association = current if current.klass == @parent_model
+          constrained_fields << current.name.to_sym if current.belongs_to?
+          if association.options[:as] and current.options[:polymorphic]
+            @child_association = current if association.options[:as].to_sym == current.name
+          else
+            @child_association = current if current.klass == @parent_model
+          end
         end
       end
     end

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -63,7 +63,9 @@ module ActiveScaffold
         if column.association
           select_options = options_for_association(column.association, false)
         else
-          select_options = Array(column.options[:options])
+          select_options = column.options[:options].collect do |text, value|
+            active_scaffold_translated_option(column, text, value)
+          end
         end
         return as_(:no_options) if select_options.empty?
 

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -86,7 +86,7 @@ module ActiveScaffold
 
       # a general-use loading indicator (the "stuff is happening, please wait" feedback)
       def loading_indicator_tag(options)
-        image_tag "indicator.gif", :style => "visibility:hidden;", :id => loading_indicator_id(options), :alt => "loading indicator", :class => "loading-indicator"
+        image_tag "active_scaffold/indicator.gif", :style => "visibility:hidden;", :id => loading_indicator_id(options), :alt => "loading indicator", :class => "loading-indicator"
       end
 
       # Creates a javascript-based link that toggles the visibility of some element on the page.

data/lib/active_scaffold/version.rb

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

data/lib/active_scaffold.rb

@@ -84,7 +84,8 @@ module ActiveScaffold
     self.class.active_scaffold_config_for(klass)
   end
 
-  def active_scaffold_session_storage(id = (params[:eid] || params[:controller]))
+  def active_scaffold_session_storage(id = nil)
+    id ||= params[:eid] || "#{params[:controller]}#{"_#{nested.parent_id}" if nested?}"
     session_index = "as:#{id}"
     session[session_index] ||= {}
     session[session_index]

data/lib/active_scaffold.rb~

@@ -13,6 +13,7 @@ require 'active_scaffold/responds_to_parent'
 
 require 'active_scaffold/version'
 require 'active_scaffold/engine' unless defined? ACTIVE_SCAFFOLD_PLUGIN
+require 'json'  # for js_config
 
 module ActiveScaffold
   autoload :AttributeParams, 'active_scaffold/attribute_params'
@@ -83,10 +84,12 @@ module ActiveScaffold
     self.class.active_scaffold_config_for(klass)
   end
 
-  def active_scaffold_session_storage(id = (params[:eid] || params[:controller]))
+  def active_scaffold_session_storage(id = nil)
+    debugger
+    id ||= params[:eid] || "#{params[:controller]}#{"_#{nested.parent_id}" if nested?}"
     session_index = "as:#{id}"
-    cookies[session_index] = {:value => {}, :expires => 1.hour.from_now} unless cookies[session_index].present?
-    cookies[session_index]
+    session[session_index] ||= {}
+    session[session_index]
   end
 
   # at some point we need to pass the session and params into config. we'll just take care of that before any particular action occurs by passing those hashes off to the UserSettings class of each action.
@@ -95,7 +98,6 @@ module ActiveScaffold
       active_scaffold_config.actions.each do |action_name|
         conf_instance = active_scaffold_config.send(action_name) rescue next
         next if conf_instance.class::UserSettings == ActiveScaffold::Config::Base::UserSettings # if it hasn't been extended, skip it
-        debugger
         active_scaffold_session_storage[action_name] ||= {}
         conf_instance.user = conf_instance.class::UserSettings.new(conf_instance, active_scaffold_session_storage[action_name], params)
       end
@@ -132,6 +134,14 @@ module ActiveScaffold
     end
   end
 
+  def self.js_config=(config)
+    @@js_config = config
+  end
+
+  def self.js_config
+    @@js_config ||= {:scroll_on_close => true}
+  end
+
   # exclude bridges you do not need
   # name of bridge subdir should be used to exclude it
   # eg

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 39
   prerelease: 
   segments: 
   - 3
   - 1
-  - 17
-  version: 3.1.17
+  - 18
+  version: 3.1.18
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-24 00:00:00 Z
+date: 2012-01-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -65,14 +65,14 @@ dependencies:
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 5
         segments: 
         - 3
         - 1
-        - 0
-        version: 3.1.0
+        - 3
+        version: 3.1.3
   requirement: *id004
   prerelease: false
   type: :runtime
@@ -86,17 +86,17 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- app/assets/images/add.gif
-- app/assets/images/arrow_down.gif
-- app/assets/images/arrow_up.gif
-- app/assets/images/close.gif
-- app/assets/images/close_touch.png
-- app/assets/images/config.png
-- app/assets/images/cross.png
-- app/assets/images/gears.png
-- app/assets/images/indicator-small.gif
-- app/assets/images/indicator.gif
-- app/assets/images/magnifier.png
+- app/assets/images/active_scaffold/add.gif
+- app/assets/images/active_scaffold/arrow_down.gif
+- app/assets/images/active_scaffold/arrow_up.gif
+- app/assets/images/active_scaffold/close.gif
+- app/assets/images/active_scaffold/close_touch.png
+- app/assets/images/active_scaffold/config.png
+- app/assets/images/active_scaffold/cross.png
+- app/assets/images/active_scaffold/gears.png
+- app/assets/images/active_scaffold/indicator-small.gif
+- app/assets/images/active_scaffold/indicator.gif
+- app/assets/images/active_scaffold/magnifier.png
 - app/assets/javascripts/active_scaffold.js.erb
 - app/assets/javascripts/jquery/active_scaffold.js
 - app/assets/javascripts/jquery/date_picker_bridge.js.erb
@@ -114,7 +114,9 @@ files:
 - app/assets/javascripts/active_scaffold.js.erb~
 - app/assets/stylesheets/active_scaffold-ie.css
 - app/assets/stylesheets/active_scaffold.css.erb
+- app/assets/stylesheets/blue-theme.css
 - app/assets/stylesheets/active_scaffold.css.erb~
+- app/assets/stylesheets/blue-theme.css~
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/es.yml