active_scaffold 3.2.2 → 3.2.3

data/README

@@ -44,7 +44,7 @@ If you want to install as plugins under vendor/plugins, install these versions:
 == Pick your own javascript framework
 
 The Rails 3.0 version uses unobtrusive Javascript, so you are free to pick your javascript framework.
-Out of the box Prototype or JQuery are supported:
+Out of the box Prototype or JQuery are supported for rails 3.1 and later. For rails 3.0 pick a JS file:
 
 Prototype 1.7 (default js framework)
 rails.js in git://github.com/vhochstein/prototype-ujs.git

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

@@ -1,15 +1,5 @@
 <table cellpadding="0" cellspacing="0">
-  <%
-    @record = if associated.empty?
-      if column.singular_association?
-        parent_record.send("build_#{column.name}".to_sym)
-      else
-        parent_record.send(column.name).build
-      end
-    else
-      associated.last
-    end
-  -%>
+  <% @record = associated.empty? ? build_associated(column, parent_record) : associated.last -%>
   <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record, :record => @record} %>
 
   <tbody id="<%= sub_form_list_id(:association => column.name) %>">

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

@@ -1,12 +1,12 @@
 <%
-   record_column = column 
-   readonly = (@record.readonly? or not @record.authorized_for?(:crud_type => :update))
-   crud_type = @record.new_record? ? :create : (readonly ? :read : :update)
-   show_actions = false 
-   config = active_scaffold_config_for(@record.class)
-   options = active_scaffold_input_options(config.columns[@record.class.primary_key], scope)
-   tr_id = "association-#{options[:id]}"
-%>
+  record_column = column 
+  readonly = (@record.readonly? or not @record.authorized_for?(:crud_type => :update))
+  crud_type = @record.new_record? ? :create : (readonly ? :read : :update)
+  show_actions = false 
+  config = active_scaffold_config_for(@record.class)
+  options = active_scaffold_input_options(config.columns[@record.class.primary_key], scope)
+  tr_id = "association-#{options[:id]}"
+-%>
 <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 => :read, :flatten => true do |column| %>
 <%
@@ -14,8 +14,13 @@
   show_actions = true
   column = column.clone
   column.form_ui ||= :select if column.association
+  
+  col_class = []
+  col_class << 'required' if column.required?
+  col_class << column.css_class unless column.css_class.nil?
+  col_class << 'hidden' if column_renders_as(column) == :hidden
 -%>
-  <td<%= ' class="hidden"'.html_safe if column_renders_as(column) == :hidden %>>
+  <td class="<%= col_class.join(' ') %>">
     <% unless readonly and not @record.new_record? or not @record.authorized_for?(:crud_type => crud_type, :column => column.name) -%>
       <%= render :partial => form_partial_for_column(column), :locals => { :column => column, :scope => scope } -%>
     <% else -%>

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

@@ -8,15 +8,20 @@
   tr_id = "association-#{options[:id]}"
 -%>
 <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| %>
+<% config.subform.columns.each :for => @record.class, :crud_type => :read, :flatten => true do |column| %>
 <%
   next unless in_subform?(column, parent_record)
   show_actions = true
   column = column.clone
   column.form_ui ||= :select if column.association
+  
+  col_class = ['form-element']
+  col_class << 'required' if column.required?
+  col_class << column.css_class unless column.css_class.nil?
+  col_class << 'hidden' if column_renders_as(column) == :hidden
 -%>
-  <li class="form-element <%= 'required' if column.required? %> <%= column.css_class unless column.css_class.nil? %>">
-    <% unless readonly -%>
+  <li class="<%= col_class.join(' ') %>">
+    <% unless readonly and not @record.new_record? or not @record.authorized_for?(:crud_type => crud_type, :column => column.name) -%>
       <%= render :partial => form_partial_for_column(column), :locals => { :column => column, :scope => scope } -%>
     <% else -%>
       <p><%= get_column_value(@record, column) -%></p>

data/lib/active_scaffold/actions/core.rb

@@ -2,6 +2,7 @@ module ActiveScaffold::Actions
   module Core
     def self.included(base)
       base.class_eval do
+        before_filter :register_constraints_with_action_columns, :if => :embedded?
         after_filter :clear_flashes
       end
       base.helper_method :nested?
@@ -17,6 +18,9 @@ module ActiveScaffold::Actions
     end
     
     protected
+    def embedded?
+      @embedded ||= params.delete(:embedded)
+    end
 
     def nested?
       false
@@ -108,16 +112,16 @@ module ActiveScaffold::Actions
       @response_object = successful? ? (@record || @records) : @record.errors
     end
 
-    # Success is the existence of certain variables and the absence of errors (when applicable).
-    # Success can also be defined.
+    # Success is the existence of one or more model objects. Most actions
+    # circumvent this method by setting @success directly.
     def successful?
       if @successful.nil?
-        @records or (@record and @record.errors.count == 0 and @record.no_errors_in_associated?)
+        @record || @records
       else
         @successful
       end
     end
-
+    
     def successful=(val)
       @successful = (val) ? true : false
     end

data/lib/active_scaffold/actions/list.rb

@@ -23,7 +23,7 @@ module ActiveScaffold::Actions
     
     protected
     def list_respond_to_html
-      if params.delete(:embedded)
+      if embedded?
         render :action => 'list', :layout => false
       else
         render :action => 'list'
@@ -32,8 +32,7 @@ module ActiveScaffold::Actions
     def list_respond_to_js
       if params[:adapter]
         render(:partial => 'list_with_header')
-      elsif params[:embedded]
-        params.delete(:embedded)
+      elsif embedded?
         render(:partial => 'list_with_header')
       else
         render :action => 'refresh_list', :formats => [:js]

data/lib/active_scaffold/bridges/calendar_date_select/as_cds_bridge.rb

@@ -58,7 +58,6 @@ ActionView::Base.class_eval do
   include ActiveScaffold::Bridges::Shared::DateBridge::HumanConditionHelpers
   alias_method :active_scaffold_human_condition_calendar_date_select, :active_scaffold_human_condition_date_bridge
   include ActiveScaffold::Bridges::CalendarDateSelect::SearchColumnHelpers
-  include ActiveScaffold::Bridges::CalendarDateSelect::ViewHelpers
 end
 
 ActiveScaffold::Finder::ClassMethods.module_eval do

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 2
-    PATCH = 2
+    PATCH = 3
 
     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: 11
+  hash: 9
   prerelease: 
   segments: 
   - 3
   - 2
-  - 2
-  version: 3.2.2
+  - 3
+  version: 3.2.3
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-15 00:00:00 Z
+date: 2012-03-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development