active_scaffold 3.1.13 → 3.1.14

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

@@ -1,7 +1,7 @@
 <%# nested_id, allows us to remove a nested scaffold programmatically %>
 <tr class="inline-adapter" id="<%= element_row_id :action => :nested %>">
   <td colspan="99" class="inline-adapter-cell">
-    <div class="<%= "#{params[:action]}-view" if params[:action] %> <%= "#{params[:associations] ? params[:associations] : params[:controller]}-view" %> view">
+    <div class="<%= "#{params[:action]}-view" if params[:action] %> <%= "#{nested? ? nested.name : id_from_controller(params[:controller])}-view" %> view">
       <%= link_to(as_(:close), '', :class => 'inline-adapter-close as_cancel', :remote => true, :title => as_(:close), 'data-refresh' => (action_name == 'index' ? true : false)) -%>
       <%= payload -%>
     </div>

data/frontends/default/views/_list_inline_adapter.html.erb~

@@ -1,7 +1,7 @@
 <%# nested_id, allows us to remove a nested scaffold programmatically %>
 <tr class="inline-adapter" id="<%= element_row_id :action => :nested %>">
   <td colspan="99" class="inline-adapter-cell">
-    <div class="<%= "#{params[:action]}-view" if params[:action] %> <%= "#{params[:associations] ? params[:associations] : params[:controller]}-view" %> view">
+    <div class="<%= "#{params[:action]}-view" if params[:action] %> <%= "#{params[:association] ? params[:association] : id_from_controller(params[:controller])}-view" %> view">
       <%= link_to(as_(:close), '', :class => 'inline-adapter-close as_cancel', :remote => true, :title => as_(:close), 'data-refresh' => (action_name == 'index' ? true : false)) -%>
       <%= payload -%>
     </div>

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

@@ -8,7 +8,7 @@
       <% old_record, @record = @record, new_model %>
         <tr>
           <td>
-            <div class="active-scaffold show_search-view <%= "#{params[:controller]}-view" %> view">
+            <div class="active-scaffold show_search-view <%= "#{id_from_controller params[:controller]}-view" %> view">
               <%= render :partial => active_scaffold_config.list.search_partial %>
             </div> 
           </td> 
@@ -21,7 +21,7 @@
       <% old_record, @record = @record, new_model %>
         <tr> 
           <td> 
-            <div  class="active-scaffold create-view <%= "#{params[:controller]}-view" %> view">
+            <div  class="active-scaffold create-view <%= "#{id_from_controller params[:controller]}-view" %> view">
               <%= render :partial => 'create_form_on_list' %>
             </div> 
           </td> 

data/frontends/default/views/_list_with_header.html.erb~

@@ -5,24 +5,28 @@
   <table cellpadding="0" cellspacing="0">
     <tbody class="before-header" id="<%= before_header_id -%>">
       <% if active_scaffold_config.list.always_show_search %>
+      <% old_record, @record = @record, new_model %>
         <tr>
           <td>
-            <div class="active-scaffold show_search-view <%= "#{params[:controller]}-view" %> view">
+            <div class="active-scaffold show_search-view <%= "#{scope_id params[:controller]}-view" %> view">
               <%= render :partial => active_scaffold_config.list.search_partial %>
             </div> 
           </td> 
         </tr>
+      <% @record = old_record %>
       <% else %>
       <tr><td></td></tr>
       <% end %>
       <% if !nested? && active_scaffold_config.list.always_show_create %>
+      <% old_record, @record = @record, new_model %>
         <tr> 
           <td> 
-            <div  class="active-scaffold create-view <%= "#{params[:controller]}-view" %> view">
+            <div  class="active-scaffold create-view <%= "#{scope_id params[:controller]}-view" %> view">
               <%= render :partial => 'create_form_on_list' %>
             </div> 
           </td> 
         </tr>
+      <% @record = old_record %>
       <% end %>
     </tbody>
   </table>

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

@@ -1,5 +1,5 @@
 <div class="active-scaffold">
-  <div class="create-view <%= "#{params[:controller]}-view" %> view">
+  <div class="create-view <%= "#{id_from_controller params[:controller]}-view" %> view">
     <%= render :partial => 'add_existing_form' -%>
   </div>
 </div>

data/frontends/default/views/add_existing_form.html.erb~

@@ -0,0 +1,5 @@
+<div class="active-scaffold">
+  <div class="create-view <%= "scope_id #{params[:controller]}-view" %> view">
+    <%= render :partial => 'add_existing_form' -%>
+  </div>
+</div>

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

@@ -1,5 +1,5 @@
 <div class="active-scaffold">
-  <div class="create-view <%= "#{params[:controller]}-view" %> view">
+  <div class="create-view <%= "#{id_from_controller params[:controller]}-view" %> view">
     <%= render :partial => 'create_form' -%>
   </div>
 </div>

data/frontends/default/views/create.html.erb~

@@ -0,0 +1,5 @@
+<div class="active-scaffold">
+  <div class="create-view <%= "#{scope_id params[:controller]}-view" %> view">
+    <%= render :partial => 'create_form' -%>
+  </div>
+</div>

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

@@ -1,5 +1,5 @@
 <div class="active-scaffold">
-  <div class="search-view <%= "#{params[:controller]}-view" %> view">
+  <div class="search-view <%= "#{id_from_controller params[:controller]}-view" %> view">
     <%= render :partial => 'search' -%>
   </div>
 </div>

data/frontends/default/views/search.html.erb~

@@ -0,0 +1,5 @@
+<div class="active-scaffold">
+  <div class="search-view <%= "#{scope_id params[:controller]}-view" %> view">
+    <%= render :partial => 'search' -%>
+  </div>
+</div>

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

@@ -1,5 +1,5 @@
 <div class="active-scaffold">
-  <div class="show-view <%= "#{params[:controller]}-view" %> view">
+  <div class="show-view <%= "#{id_from_controller params[:controller]}-view" %> view">
     <%= render :partial => 'show' -%>
   </div>
 </div>

data/frontends/default/views/show.html.erb~

@@ -0,0 +1,5 @@
+<div class="active-scaffold">
+  <div class="show-view <%= "#{scope_id params[:controller]}-view" %> view">
+    <%= render :partial => 'show' -%>
+  </div>
+</div>

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

@@ -1,5 +1,5 @@
 <div class="active-scaffold">
-  <div class="update-view <%= "#{params[:controller]}-view" %> view">
+  <div class="update-view <%= "#{id_from_controller params[:controller]}-view" %> view">
     <% if active_scaffold_config.update.nested_links and active_scaffold_config.action_links.member.empty? -%>
     <%= render :partial => 'update_actions', :locals => {:record => @record, :url_options => params_for(:action => :list, :id => @record.id)} %>
     <% end -%>

data/frontends/default/views/update.html.erb~

@@ -0,0 +1,8 @@
+<div class="active-scaffold">
+  <div class="update-view <%= "#{scope_id params[:controller]}-view" %> view">
+    <% if active_scaffold_config.update.nested_links and active_scaffold_config.action_links.member.empty? -%>
+    <%= render :partial => 'update_actions', :locals => {:record => @record, :url_options => params_for(:action => :list, :id => @record.id)} %>
+    <% end -%>
+    <%= render :partial => 'update_form' -%>
+  </div>
+</div>

data/lib/active_scaffold/config/delete.rb

@@ -15,7 +15,7 @@ module ActiveScaffold::Config
 
     # the ActionLink for this action
     cattr_accessor :link
-    @@link = ActiveScaffold::DataStructures::ActionLink.new('destroy', :label => :delete, :type => :member, :confirm => :are_you_sure_to_delete, :method => :delete, :crud_type => :delete, :position => false, :parameters => {:destroy_action => true}, :security_method => :delete_authorized?)
+    @@link = ActiveScaffold::DataStructures::ActionLink.new('destroy', :label => :delete, :type => :member, :confirm => :are_you_sure_to_delete, :method => :delete, :crud_type => :delete, :position => false, :parameters => {:destroy_action => true}, :security_method => :delete_authorized?, :ignore_method => :delete_ignore?)
 
     # whether we should refresh list after destroy or not
     cattr_accessor :refresh_list

data/lib/active_scaffold/data_structures/action_links.rb

@@ -173,7 +173,7 @@ module ActiveScaffold::DataStructures
     protected
 
     def skip_action_link(controller, link, *args)
-      (!link.ignore_method.nil? and controller.try(link.ignore_method, *args)) || ((link.security_method_set? or controller.respond_to? link.security_method) and !controller.send(link.security_method, *args))
+      (!link.ignore_method.nil? && controller.respond_to?(link.ignore_method) && controller.send(link.ignore_method, *args)) || ((link.security_method_set? or controller.respond_to? link.security_method) and !controller.send(link.security_method, *args))
     end
 
     # called during clone or dup. makes the clone/dup deeper.

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -70,6 +70,10 @@ module ActiveScaffold::DataStructures
       iterate_model_associations(model)
     end
     
+    def name
+      self.association.name
+    end
+    
     def habtm?
       association.macro == :has_and_belongs_to_many 
     end
@@ -115,7 +119,7 @@ module ActiveScaffold::DataStructures
         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
+          @child_association = current if current.klass == @parent_model
         end
       end
     end
@@ -131,5 +135,9 @@ module ActiveScaffold::DataStructures
     def to_params
       super.merge(:named_scope => @scope)
     end
+    
+    def name
+      self.scope
+    end
   end
 end

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

@@ -61,6 +61,9 @@ module ActiveScaffold::DataStructures
     def sorted?
       false
     end
+    
+    def name
+    end
   end
   
   class NestedInfoAssociation < NestedInfo
@@ -70,6 +73,10 @@ module ActiveScaffold::DataStructures
       iterate_model_associations(model)
     end
     
+    def name
+      self.association.name
+    end
+    
     def habtm?
       association.macro == :has_and_belongs_to_many 
     end
@@ -99,7 +106,7 @@ module ActiveScaffold::DataStructures
     end
     
     def to_params
-      super.merge(:association => @association, :assoc_id => parent_id)
+      super.merge(:association => @association.name, :assoc_id => parent_id)
     end
     
     protected
@@ -115,7 +122,7 @@ module ActiveScaffold::DataStructures
         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
+          @child_association = current if current.klass == @parent_model
         end
       end
     end
@@ -131,5 +138,9 @@ module ActiveScaffold::DataStructures
     def to_params
       super.merge(:named_scope => @scope)
     end
+    
+    def name
+      self.scope
+    end
   end
 end

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -100,7 +100,7 @@ module ActiveScaffold
       end
 
       def skip_action_link(link, *args)
-        (!link.ignore_method.nil? and controller.try(link.ignore_method, *args)) || ((link.security_method_set? or controller.respond_to? link.security_method) and !controller.send(link.security_method, *args))
+        (!link.ignore_method.nil? && controller.respond_to?(link.ignore_method) && controller.send(link.ignore_method, *args)) || ((link.security_method_set? or controller.respond_to? link.security_method) and !controller.send(link.security_method, *args))
       end
 
       def render_action_link(link, url_options, record = nil, html_options = {})
@@ -239,7 +239,7 @@ module ActiveScaffold
       end
 
       def as_main_div_class
-        classes = ["active-scaffold", "active-scaffold-#{controller_id}", "#{params[:controller]}-view", "#{active_scaffold_config.theme}-theme"]
+        classes = ["active-scaffold", "active-scaffold-#{controller_id}", "#{id_from_controller params[:controller]}-view", "#{active_scaffold_config.theme}-theme"]
         classes << "as_touch" if touch_device?
         classes.join(' ')
       end

data/lib/active_scaffold/helpers/view_helpers.rb~

@@ -100,7 +100,7 @@ module ActiveScaffold
       end
 
       def skip_action_link(link, *args)
-        (!link.ignore_method.nil? and controller.try(link.ignore_method, *args)) || ((link.security_method_set? or controller.respond_to? link.security_method) and !controller.send(link.security_method, *args))
+        (!link.ignore_method.nil? && controller.respond_to?(link.ignore_method) && controller.send(link.ignore_method, *args)) || ((link.security_method_set? or controller.respond_to? link.security_method) and !controller.send(link.security_method, *args))
       end
 
       def render_action_link(link, url_options, record = nil, html_options = {})
@@ -194,7 +194,7 @@ module ActiveScaffold
           url_options[:eid] = link.eid
         elsif link.parameters && link.parameters[:named_scope]
           url_options[:assoc_id] = url_options.delete(:id)
-          link.eid = "#{controller_id.from(3)}_#{record.id}_#{link.parameters[:named_scope]}" unless record.nil? || options.has_key?(:reuse_eid)
+          link.eid = "#{controller_id.from(3)}_#{record.id}_#{link.parameters[:named_scope]}" unless options.has_key?(:reuse_eid)
           url_options[:eid] = link.eid
         end
       end
@@ -265,7 +265,7 @@ module ActiveScaffold
 
       def render_column_calculation(column)
         calculation = column_calculation(column)
-        override_formatter = "render_#{column.name}_#{column.calculate}"
+        override_formatter = "render_#{column.name}_#{column.calculate.is_a?(Proc) ? :calculate : column.calculate}"
         calculation = send(override_formatter, calculation) if respond_to? override_formatter
 
         "#{"#{as_(column.calculate)}: " unless column.calculate.is_a? Proc}#{format_column_value nil, column, calculation}"

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 3
   - 1
-  - 13
-  version: 3.1.13
+  - 14
+  version: 3.1.14
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-21 00:00:00 Z
+date: 2012-01-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -159,22 +159,22 @@ files:
 - frontends/default/views/delete.html.erb
 - frontends/default/views/add_existing_form.html.erb
 - frontends/default/views/create.html.erb
-- frontends/default/views/_horizontal_subform_footer.html.erb
+- frontends/default/views/_list_messages.html.erb
 - frontends/default/views/_human_conditions.html.erb
 - frontends/default/views/field_search.html.erb
 - frontends/default/views/add_existing.js.erb
 - frontends/default/views/search.html.erb
 - frontends/default/views/destroy.js.erb
 - frontends/default/views/update.html.erb
-- frontends/default/views/_list_messages.html.erb
+- frontends/default/views/_list_with_header.html.erb
 - frontends/default/views/_list_pagination.html.erb
 - frontends/default/views/show.html.erb
+- frontends/default/views/form_messages.js.erb
 - frontends/default/views/_list_record_columns.html.erb
-- frontends/default/views/_list_with_header.html.erb
+- frontends/default/views/edit_associated.js.erb
 - frontends/default/views/_search_attribute.html.erb
 - frontends/default/views/action_confirmation.html.erb
-- frontends/default/views/edit_associated.js.erb
-- frontends/default/views/form_messages.js.erb
+- frontends/default/views/_horizontal_subform_footer.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
@@ -190,7 +190,6 @@ files:
 - frontends/default/views/update_column.js.erb~
 - frontends/default/views/_form_association_footer.html.erb~
 - frontends/default/views/edit_associated.js.erb~
-- frontends/default/views/_list_inline_adapter.html.erb~
 - frontends/default/views/_form_association.html.erb~
 - frontends/default/views/_vertical_subform.html.erb~
 - frontends/default/views/_horizontal_subform.html.erb~
@@ -208,6 +207,12 @@ files:
 - frontends/default/views/_list_with_header.html.erb~
 - frontends/default/views/_update_form.html.erb~
 - frontends/default/views/add_existing.js.erb~
+- frontends/default/views/_list_inline_adapter.html.erb~
+- frontends/default/views/add_existing_form.html.erb~
+- frontends/default/views/update.html.erb~
+- frontends/default/views/search.html.erb~
+- frontends/default/views/create.html.erb~
+- frontends/default/views/show.html.erb~
 - lib/active_scaffold.rb
 - lib/active_scaffold_env.rb
 - lib/active_scaffold/actions/core.rb
@@ -257,11 +262,11 @@ files:
 - lib/active_scaffold/data_structures/error_message.rb
 - lib/active_scaffold/data_structures/set.rb
 - lib/active_scaffold/data_structures/sorting.rb
-- lib/active_scaffold/data_structures/bridge.rb
 - lib/active_scaffold/data_structures/nested_info.rb
+- lib/active_scaffold/data_structures/bridge.rb
+- lib/active_scaffold/data_structures/nested_info.rb~
 - lib/active_scaffold/data_structures/action_columns.rb~
 - lib/active_scaffold/data_structures/action_link.rb~
-- lib/active_scaffold/data_structures/nested_info.rb~
 - lib/active_scaffold/finder.rb
 - lib/active_scaffold/helpers/association_helpers.rb
 - lib/active_scaffold/helpers/controller_helpers.rb
@@ -324,7 +329,7 @@ files:
 - lib/active_scaffold/bridges/shared/date_bridge.rb~
 - lib/active_scaffold/bridges/tiny_mce.rb
 - lib/active_scaffold/bridges/tiny_mce/helpers.rb
-- lib/active_scaffold/engine.rb
+- lib/active_scaffold/version.rb
 - lib/active_scaffold/marked_model.rb
 - lib/active_scaffold/extensions/action_controller_rendering.rb
 - lib/active_scaffold/extensions/action_view_rendering.rb
@@ -351,7 +356,7 @@ files:
 - lib/active_scaffold/extensions/active_association_reflection.rb~
 - lib/active_scaffold/paginator.rb
 - lib/active_scaffold/responds_to_parent.rb
-- lib/active_scaffold/version.rb
+- lib/active_scaffold/engine.rb
 - lib/active_scaffold/attribute_params.rb~
 - lib/active_scaffold/finder.rb~
 - lib/active_scaffold/constraints.rb~