active_scaffold 3.1.5 → 3.1.6

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

@@ -1,7 +1,7 @@
 <thead>
   <tr>
     <%
-    active_scaffold_config_for(record.class).subform.columns.each :for => record.class, :flatten => true do |column|
+    active_scaffold_config_for(record.class).subform.columns.each :for => record.class, :crud_type => :read, :flatten => true do |column|
       hidden = column_renders_as(column) == :hidden
       next unless in_subform?(column, parent_record)
       -%>

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

@@ -1,7 +1,7 @@
 <thead>
   <tr>
     <%
-    active_scaffold_config_for(@record.class).subform.columns.each :for => @record.class, :flatten => true do |column|
+    active_scaffold_config_for(record.class).subform.columns.each :for => record.class, :flatten => true do |column|
       hidden = column_renders_as(column) == :hidden
       next unless in_subform?(column, parent_record)
       -%>

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

@@ -8,7 +8,7 @@
    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 => 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

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

@@ -15,7 +15,7 @@
   column = column.clone
   column.form_ui ||= :select if column.association
 -%>
-  <td class="<%= 'hidden' if column_renders_as(column) == :hidden %>">
+  <td<%= ' class="hidden"'.html_safe if column_renders_as(column) == :hidden %>>
     <% 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/_show.html.erb~

@@ -0,0 +1,9 @@
+<% debugger %>
+<h4><%= active_scaffold_config.show.label(@record.to_label.nil? ? nil : clean_column_value(@record.to_label)) %></h4>
+
+<%= render :partial => 'show_columns', :locals => {:columns => active_scaffold_config.show.columns} -%>
+
+<p class="form-footer">
+  <%= link_to as_(:close), main_path_to_return, :class => 'as_cancel', :remote => request.xhr?, 'data-refresh' => false %>
+  <%= loading_indicator_tag(:action => :create, :id => params[:id]) %>
+</p>

data/frontends/default/views/on_create.js.erb

@@ -2,7 +2,7 @@ try {
 <% form_selector = "#{element_form_id(:action => :create)}"
 insert_at ||= :top %>
 var action_link = ActiveScaffold.find_action_link('<%= form_selector%>');
-action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'messages').strip)%>');
+action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'messages'))%>');
 <% if controller.send :successful? %>
   <% if render_parent? && controller.respond_to?(:render_component_into_view) %>
     <% parent_rendered = controller.send(:render_component_into_view, render_parent_options) %>

data/frontends/default/views/on_create.js.erb~

@@ -0,0 +1,45 @@
+try {
+<% form_selector = "#{element_form_id(:action => :create)}"
+insert_at ||= :top %>
+var action_link = ActiveScaffold.find_action_link('<%= form_selector%>');
+action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'messages').strip)%>');
+<% if controller.send :successful? %>
+  <% if render_parent? && controller.respond_to?(:render_component_into_view) %>
+    <% parent_rendered = controller.send(:render_component_into_view, render_parent_options) %>
+    <% if nested_singular_association? %>
+      action_link.close('<%= escape_javascript(parent_rendered)%>');
+    <% else %>
+      <% if render_parent_action == :row %>
+        ActiveScaffold.create_record_row(action_link.scaffold(),'<%=  escape_javascript(parent_rendered)%>', <%= {:insert_at => insert_at}.to_json.html_safe %>);
+      <% elsif render_parent_action == :index %>
+        <%= escape_javascript(parent_rendered) %>
+      <% end %>
+      action_link.close();
+    <% end %>
+    <%#page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
+  <% elsif (active_scaffold_config.create.refresh_list) %>
+    ActiveScaffold.replace_html(<%= active_scaffold_content_id%>, <%= escape_javascript(render(:partial => 'list', :layout => false)) %>);
+  <% elsif params[:parent_controller].nil? %>
+    <% new_row = render :partial => 'list_record', :locals => {:record => @record} %>
+    ActiveScaffold.create_record_row(action_link.scaffold(),'<%=escape_javascript(new_row)%>', <%={:insert_at => insert_at}.to_json.html_safe%>);
+    <% if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
+      ActiveScaffold.replace('<%=active_scaffold_calculations_id%>', '<%=escape_javascript(render(:partial => 'list_calculations'))%>');
+    <% end %>
+  <% end %>
+
+  <% unless render_parent? %>
+    <% if (active_scaffold_config.create.persistent) %>
+      action_link.reload();
+    <% else %>
+      action_link.close();
+    <% end %>
+    <% if (active_scaffold_config.create.action_after_create) %>
+      var link = $('<%=action_link_id active_scaffold_config.create.action_after_create, @record.id%>');
+      if (link) (function() { link.action_link.open() }).defer();
+    <% end %>
+  <% end %>
+<% else %>
+  ActiveScaffold.replace('<%=form_selector%>','<%=escape_javascript(render(:partial => 'create_form', :locals => {:xhr => true}))%>');
+  ActiveScaffold.scroll_to('<%=form_selector%>');
+<% end %>
+} catch (e) { alert('RJS error:\n\n' + e.toString());}

data/frontends/default/views/on_update.js.erb

@@ -1,7 +1,7 @@
 try {
 <% form_selector = "#{element_form_id(:action => :update)}" %>
 var action_link = ActiveScaffold.find_action_link('<%= form_selector%>');
-action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'messages').strip)%>');
+action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'messages'))%>');
 <% if controller.send :successful? %>
   <% if render_parent? && controller.respond_to?(:render_component_into_view) %>
     <% parent_rendered = controller.send(:render_component_into_view, render_parent_options) %>

data/frontends/default/views/on_update.js.erb~

@@ -0,0 +1,31 @@
+try {
+<% form_selector = "#{element_form_id(:action => :update)}" %>
+var action_link = ActiveScaffold.find_action_link('<%= form_selector%>');
+action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'messages').strip)%>');
+<% if controller.send :successful? %>
+  <% if render_parent? && controller.respond_to?(:render_component_into_view) %>
+    <% parent_rendered = controller.send(:render_component_into_view, render_parent_options) %>
+    <% if nested_singular_association? %>
+      action_link.close('<%= escape_javascript(parent_rendered)%>');
+    <% else %>
+      <% if render_parent_action == :row %>
+        action_link.close('<%= escape_javascript(parent_rendered)%>');
+      <% elsif render_parent_action == :index %>
+        <%= escape_javascript(parent_rendered) %>
+      <% end %>
+    <% end %>
+    <%#page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
+  <% elsif update_refresh_list? %>
+    ActiveScaffold.replace_html('<%= active_scaffold_content_id%>', '<%= escape_javascript(render(:partial => 'list', :layout => false))%>');
+   <% else %>
+    <% updated_row = render :partial => 'list_record', :locals => {:record => @record}%>
+    action_link.close('<%= escape_javascript(updated_row)%>');
+    <% if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
+      ActiveScaffold.replace('<%=active_scaffold_calculations_id%>', '<%=escape_javascript(render(:partial => 'list_calculations'))%>');
+    <% end %>
+  <% end %>
+<% else %>
+  ActiveScaffold.replace('<%=form_selector%>','<%=escape_javascript(render(:partial => 'update_form', :locals => {:xhr => true}))%>');
+  ActiveScaffold.scroll_to('<%=form_selector%>');
+<% end %>
+} catch (e) { alert('RJS error:\n\n' + e.toString());}

data/lib/active_scaffold/actions/core.rb

@@ -165,7 +165,7 @@ module ActiveScaffold::Actions
         params = params[:record] || {} unless params[model.inheritance_column] # in create action must be inside record key
         model = params.delete(model.inheritance_column).camelize.constantize if params[model.inheritance_column]
       end
-      model.respond_to?(:build) ? model.build(build_options || {}) : model.new
+      model.new(build_options || {})
     end
 
     private

data/lib/active_scaffold/bridges/file_column/form_ui.rb

@@ -3,35 +3,32 @@ module ActiveScaffold
     # Helpers that assist with the rendering of a Form Column
     module FormColumnHelpers
       def active_scaffold_input_file_column(column, options)
-        if @record.send(column.name) 
-          # we already have a value?  display the form for deletion.
+       if @record.send(column.name) 
+          # we already have a value? display the form for deletion.
           if ActiveScaffold.js_framework == :jquery
-            js_remove_file_code = "$(this).prev().val('true'); $(this).parent().hide().next().show(); return false;";
+            remove_file_js = "$(this).prev().val('true'); $(this).parent().hide().next().show(); return false;";
           else
-            js_remove_file_code = "$(this).previous().value='true'; p=$(this).up(); p.hide(); p.next().show(); return false;";
+            remove_file_js = "$(this).previous().value='true'; p=$(this).up(); p.hide(); p.next().show(); return false;";
+          end            
+          
+          hidden_options = options.dup
+          hidden_options[:id] += '_delete'
+          hidden_options[:name].sub!("[#{column.name}]", "[delete_#{column.name}]")
+          hidden_options[:value] = 'false'          
+          custom_hidden_field_tag = hidden_field(:record, column.name, hidden_options)
+
+          content_tag(:div) do
+            content_tag(:div) do
+              content = get_column_value(@record, column) + " #{custom_hidden_field_tag} | ".html_safe
+              content += content_tag(:a, as_(:remove_file), {:href => '#', :onclick => remove_file_js})
+              content += content_tag(:div, file_column_field("record", column.name, options), :style => "display: none")
+            end           
           end
-          content_tag(
-            :div, 
-            content_tag(
-              :div, 
-              get_column_value(@record, column) + " " +
-              custom_hidden_field_tag +
-              " | " +
-                content_tag(:a, as_(:remove_file), {:href => '#', :onclick => js_remove_file_code}),
-              {}
-            ) +
-            content_tag(
-              :div,
-              file_column_field("record", column.name, options),
-              :style => "display: none"
-            ),
-            {}
-          )
-        else
-          # no, just display the file_column_field
-          file_column_field("record", column.name, options)
-        end
-      end      
+       else
+          file_column_field("record", column.name, options)          
+       end        
+      end
+      
     end
   end
 end

data/lib/active_scaffold/config/base.rb

@@ -26,7 +26,8 @@ module ActiveScaffold::Config
     def crud_type; self.class.crud_type end
 
     def label(model = nil)
-      as_(@label, :model => model || @core.label(:count => 1))
+      model ||= @core.label(:count => 1)
+      @label.nil? ? model : as_(@label, :model => model)
     end
     
     # the user property gets set to the instantiation of the local UserSettings class during the automatic instantiation of this class.

data/lib/active_scaffold/config/base.rb~

@@ -0,0 +1,70 @@
+module ActiveScaffold::Config
+  class Base
+    include ActiveScaffold::Configurable
+    extend ActiveScaffold::Configurable
+
+    def initialize(core_config)
+      @core = core_config
+    end
+
+    def self.inherited(subclass)
+      class << subclass
+        # the crud type of the action. possible values are :create, :read, :update, :delete, and nil.
+        # this is not a setting for the developer. it's self-description for the actions.
+        def crud_type; @crud_type; end
+
+        protected
+
+        def crud_type=(val)
+          raise ArgumentError, "unknown CRUD type #{val}" unless [:create, :read, :update, :delete].include?(val.to_sym)
+          @crud_type = val.to_sym
+        end
+      end
+    end
+
+    # delegate
+    def crud_type; self.class.crud_type end
+
+    def label(model = @core.label(:count => 1))
+      @label.nil? ? model : as_(@label, :model => model)
+    end
+    
+    # the user property gets set to the instantiation of the local UserSettings class during the automatic instantiation of this class.
+    attr_accessor :user
+
+    # define a default action_group for this action
+    # e.g. 'members.crud'
+    class_attribute :action_group
+
+    # action_group this action should belong to
+    attr_accessor :action_group
+
+    class UserSettings
+      def initialize(conf, storage, params)
+        # the session hash relevant to this action
+        @session = storage
+        # all the request params
+        @params = params
+        # the configuration object for this action
+        @conf = conf
+      end
+    end
+    
+    def formats
+      @formats ||= []
+    end
+    
+    def formats=(val)
+      @formats=val
+    end
+    
+    private
+    
+    def columns=(val)
+      @columns = ActiveScaffold::DataStructures::ActionColumns.new(*val)
+      @columns.action = self
+      @columns.set_columns(@core.columns) if @columns.respond_to?(:set_columns)
+      @columns
+    end
+  end
+end

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -133,7 +133,7 @@ module ActiveScaffold
           end
           content
         end
-        html << javascript_tag("new DraggableLists('#{options[:id]}')") if column.options[:draggable_lists]
+        html << javascript_tag("ActiveScaffold.draggable_lists('#{options[:id]}')") if column.options[:draggable_lists]
         html
       end
 

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

@@ -121,8 +121,7 @@ module ActiveScaffold
       end
       
       def active_scaffold_checkbox_list(column, select_options, associated_ids, options)
-        options[:class] << " checkbox-list"
-        html = content_tag :ul, :class => options[:class], :id => options[:id] do
+        html = content_tag :ul, :class => "#{options[:class]} checkbox-list", :id => options[:id] do
           content = "".html_safe
           select_options.each_with_index do |option, i|
             label, id = option

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 1
-    PATCH = 5
+    PATCH = 6
 
     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: 9
+  hash: 15
   prerelease: 
   segments: 
   - 3
   - 1
-  - 5
-  version: 3.1.5
+  - 6
+  version: 3.1.6
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-07 00:00:00 Z
+date: 2011-10-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -101,14 +101,18 @@ files:
 - app/assets/javascripts/jquery/active_scaffold.js
 - app/assets/javascripts/jquery/date_picker_bridge.js.erb
 - app/assets/javascripts/jquery/jquery.editinplace.js
+- app/assets/javascripts/jquery/draggable_lists.js
 - app/assets/javascripts/jquery/active_scaffold.js~
+- app/assets/javascripts/jquery/draggable_lists.js~
 - app/assets/javascripts/prototype/active_scaffold.js
 - app/assets/javascripts/prototype/dhtml_history.js
 - app/assets/javascripts/prototype/form_enhancements.js
 - app/assets/javascripts/prototype/rico_corner.js
 - app/assets/javascripts/prototype/active_scaffold.js~
+- app/assets/javascripts/active_scaffold.js.erb~
 - app/assets/stylesheets/active_scaffold-ie.css
 - app/assets/stylesheets/active_scaffold.css.erb
+- app/assets/stylesheets/active_scaffold.css.erb~
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/es.yml
@@ -182,13 +186,13 @@ files:
 - frontends/default/views/_form.html.erb~
 - frontends/default/views/_row.html.erb~
 - frontends/default/views/render_field.js.erb~
-- frontends/default/views/_horizontal_subform_record.html.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~
+- frontends/default/views/_show.html.erb~
 - frontends/default/views/_horizontal_subform_header.html.erb~
 - frontends/default/views/_list_pagination.html.erb~
 - frontends/default/views/_list_actions.html.erb~
@@ -196,6 +200,9 @@ files:
 - frontends/default/views/_list_messages.html.erb~
 - frontends/default/views/_render_field.js.erb~
 - frontends/default/views/_action_group.html.erb~
+- frontends/default/views/on_update.js.erb~
+- frontends/default/views/on_create.js.erb~
+- frontends/default/views/_horizontal_subform_record.html.erb~
 - lib/active_scaffold.rb
 - lib/active_scaffold_env.rb
 - lib/active_scaffold/actions/core.rb
@@ -233,6 +240,7 @@ files:
 - lib/active_scaffold/config/mark.rb
 - lib/active_scaffold/config/search.rb~
 - lib/active_scaffold/config/nested.rb~
+- lib/active_scaffold/config/base.rb~
 - lib/active_scaffold/configurable.rb
 - lib/active_scaffold/constraints.rb
 - lib/active_scaffold/data_structures/action_columns.rb