active_scaffold 3.0.26 → 3.1.3

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

@@ -1,8 +1,8 @@
-<h4><%= active_scaffold_config.show.label -%></h4>
+<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>
+</p>

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

@@ -0,0 +1,20 @@
+<% new_row = render :partial => 'list_record', :locals => {:record => @record}%>
+ActiveScaffold.create_record_row('#{active_scaffold_id}','#{escape_javascript(new_row)}', #{{:insert_at => :top}.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%>
+<%%>
+<% if(form_stays_open == true)%>
+  <%# why not just re-render the form? that wouldn't utilize a possible do_new override which sets default values.%>
+  ActiveScaffold.reset_form('<%element_form_id%>');
+  ActiveScaffold.replace_html('<%element_messages_id(:action => :add_existing)%>', '<%=escape_javascript(render(:partial => 'form_messages'))%>');
+  <%# have to delay the focus, because there's no "firstElement" in prototype until at least one element is not disabled%>
+  <%if ActiveScaffold.js_framework == :prototype%>
+    page.delay 0.1 do
+      page << "ActiveScaffold.focus_first_element_of_form('#{element_form_id}');"
+    end
+  <%end%>
+<%else%>
+  ActiveScaffold.find_action_link('<%element_form_id(:action => :new_existing)%>').close();
+<%end%>

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

@@ -0,0 +1,24 @@
+<%messages_id = active_scaffold_messages_id%>
+<%if controller.send(:successful?)%>
+  <%if render_parent? && controller.respond_to?(:render_component_into_view)%>
+    <%render_parent_options%>
+    <%if render_parent_action == :row%>
+      <%# TODO: That s not working with delete....%>
+      ActiveScaffold.delete_record_row('<%=element_row_id(:controller_id => "as_#{id_from_controller(params[:eid] || params[:parent_sti])}", :action => 'list', :id => params[:id])%>', '<%=url_for(params_for(:action => :index, :id => nil, :page => [active_scaffold_config.list.user.page.to_i - 1, 1].max, :escape => false))%>');
+      <%messages_id = active_scaffold_messages_id(:controller_id => "as_#{id_from_controller(params[:eid] || params[:parent_sti])}")%>
+    <%elsif render_parent_action == :index%>
+      <%= escape_javascript(controller.send(:render_component_into_view, render_parent_options))%>
+    <%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.delete.refresh_list)%>
+    ActiveScaffold.replace('<%=active_scaffold_content_id%>', '<%=escape_javascript(render(:partial => 'list', :layout => false))%>');
+  <%else%>
+    ActiveScaffold.delete_record_row('<%=element_row_id(:action => 'list', :id => params[:id])%>', '<%=url_for(params_for(:action => :index, :id => nil, :page => [active_scaffold_config.list.user.page.to_i - 1, 1].max, :escape => false))%>');
+    <% 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%>
+  <%flash[:error] = active_scaffold_error_messages_for(@record, :object_name => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :header_message => '', :message => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :container_tag => nil, :list_type => :br)%>
+<%end%>
+ActiveScaffold.replace_html('<%=messages_id%>', '<%=escape_javascript(render(:partial => 'messages'))%>');

data/frontends/default/views/{edit_associated.js.rjs → edit_associated.js.erb}

@@ -1,3 +1,4 @@
+<%
 associated_form = render :partial => "#{subform_partial_for_column(@column)}_record", :locals => {:scope => @scope, :parent_record => @parent_record, :column => @column, :locked => @record.new_record? && @column.singular_association?}
 options = {:singular => false}
 if @column.singular_association?
@@ -7,5 +8,5 @@ else
     column = active_scaffold_config_for(@record.class).columns[@record.class.primary_key]
     options[:id] = active_scaffold_input_options(column, @scope)[:id]
   end
-end
-page.call 'ActiveScaffold.create_associated_record_form', sub_form_list_id(:association => @column.name), associated_form, options
+end %>
+ActiveScaffold.create_associated_record_form('<%=sub_form_list_id(:association => @column.name)%>','<%=escape_javascript(associated_form)%>', <%= options.to_json.html_safe %>);

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

@@ -0,0 +1 @@
+ActiveScaffold.replace_html('<%=element_messages_id%>','<%=escape_javascript(render(:partial => 'form_messages'))%>');

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

@@ -0,0 +1 @@
+ActiveScaffold.replace_html('<%=active_scaffold_content_id%>','<%=escape_javascript(render(:partial => 'list', :layout => false))%>');

data/frontends/default/views/mark.js.rjs

@@ -0,0 +1,6 @@
+if params[:id]
+  # FIXME: It isn't right when there are filtered records by a search
+  page << "$('#{active_scaffold_id}').down('.mark_record').checked = #{@mark ? true : false};"
+else
+  page << "$$('##{active_scaffold_tbody_id} > tr > td > .mark_record').each(function(checkbox) { checkbox.checked = #{@mark ? true : false};});"
+end

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

@@ -0,0 +1,13 @@
+<%if controller.send :successful?%>
+  ActiveScaffold.replace_html('<%=active_scaffold_messages_id%>','<%=escape_javascript(render(:partial => 'messages'))%>');
+  <%if @record%>
+  ActiveScaffold.update_row('<%=element_row_id(:action => :list, :id => @record.id)%>','<%=escape_javascript(render(:partial => 'list_record', :locals => {:record => @record}))%>');
+  <%end%>
+  <% if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
+      ActiveScaffold.replace('<%=active_scaffold_calculations_id%>', '<%=escape_javascript(render(:partial => 'list_calculations'))%>');
+    <% end %>
+<%else%>
+  <%flash[:error] = active_scaffold_error_messages_for(@record, :object_name => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :header_message => '', :message => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :container_tag => nil, :list_type => :br)%>
+  ActiveScaffold.replace_html('<%=active_scaffold_messages_id%>','<%=escape_javascript(render(:partial => 'messages'))%>');
+  ActiveScaffold.scroll_to('<%=active_scaffold_messages_id%>');
+<%end%>

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

@@ -0,0 +1,12 @@
+<%options = {:checked => mark_all,
+           :include_mark_all => true}%>
+ActiveScaffold.mark_records('<%=active_scaffold_tbody_id%>',<%=options.to_json.html_safe%>);
+<%if active_scaffold_config.model.marked.length>0 then %>
+  <%if active_scaffold_config.model.marked.length < @page.pager.count then%>
+    ActiveScaffold.replace_html('<%=active_scaffold_messages_id%>','<%="#{active_scaffold_config.model.marked.length.to_s} records marked. Press <a href=\"#{url_for(:action=>"mark_all",:mark_target=>"scope")}\">here</a> to select all #{@page.pager.count} records.".html_safe%>');
+  <%else%>
+    ActiveScaffold.replace_html('<%=active_scaffold_messages_id%>','<%="All #{@page.pager.count} records marked".html_safe%>');
+  <%end%>
+<%else%>
+  ActiveScaffold.replace_html('<%=active_scaffold_messages_id%>','');
+<%end%>

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

@@ -0,0 +1 @@
+<%= render :partial => "render_field", :collection => @columns, :locals => {:source_id => @source_id, :scope => @scope} %>

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

@@ -2,4 +2,4 @@
   <div class="search-view <%= "#{params[:controller]}-view" %> view">
     <%= render :partial => 'search' -%>
   </div>
-</div>
+</div>

data/frontends/default/views/{update_column.js.erb~ → update_column.js.erb}

@@ -1,14 +1,14 @@
-<% @column_span_id ||= element_cell_id(:id => @record.id.to_s, :action => 'update_column', :name => params[:column]) %>
+<% column_span_id ||= element_cell_id(:id => @record.id.to_s, :action => 'update_column', :name => params[:column])%>
 <% unless controller.send :successful?%>
   alert('<%= escape_javascript(@record.errors.full_messages.join("\n"))%>');
   <% @record.reload%>
 <% end%>
 <% column = active_scaffold_config.columns[params[:column]]%>
 <% if column.inplace_edit%>
-  ActiveScaffold.replace_html('<%=@column_span_id%>','<%=escape_javascript(format_inplace_edit_column(@record, column))%>');
+  ActiveScaffold.replace_html('<%=column_span_id%>','<%=escape_javascript(format_inplace_edit_column(@record, column))%>');
 <% else%>
   <% formatted_value = get_column_value(@record, column)%>
-  ActiveScaffold.replace_html('<%=@column_span_id%>','<%=escape_javascript(formatted_value)%>');
+  ActiveScaffold.replace_html('<%=column_span_id%>','<%=escape_javascript(formatted_value)%>');
 <% end%>
 <% if column.calculation?%>
  ActiveScaffold.replace_html('<%=active_scaffold_calculations_id(column)%>', '<%=escape_javascript(render_column_calculation(column))%>');

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

@@ -0,0 +1 @@
+ActiveScaffold.update_row('<%=element_row_id(:action => 'list', :id => @record.id)%>','<%=escape_javascript(render(:partial => 'list_record', :locals => {:record => @record}))%>');

data/lib/active_scaffold.rb

@@ -1,22 +1,18 @@
-unless Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 0
-  raise "This version of ActiveScaffold requires Rails 3.0 or higher.  Please use an earlier version."
+unless Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 1
+  raise "This version of ActiveScaffold requires Rails 3.1 or higher.  Please use an earlier version."
 end
 
 begin
   require 'render_component'
 rescue LoadError
 end
-begin
-  require 'verification'
-rescue LoadError
-end
 
-require 'active_scaffold_assets'
 require 'active_scaffold/active_record_permissions'
 require 'active_scaffold/paginator'
 require 'active_scaffold/responds_to_parent'
 
 require 'active_scaffold/version'
+require 'active_scaffold/engine' unless defined? ACTIVE_SCAFFOLD_PLUGIN
 
 module ActiveScaffold
   autoload :AttributeParams, 'active_scaffold/attribute_params'
@@ -24,6 +20,12 @@ module ActiveScaffold
   autoload :Constraints, 'active_scaffold/constraints'
   autoload :Finder, 'active_scaffold/finder'
   autoload :MarkedModel, 'active_scaffold/marked_model'
+  autoload :Bridges, 'active_scaffold/bridges'
+
+  mattr_accessor :stylesheets
+  self.stylesheets = []
+  mattr_accessor :javascripts
+  self.javascripts = []
 
   def self.autoload_subdir(dir, mod=self, root = File.dirname(__FILE__))
     Dir["#{root}/active_scaffold/#{dir}/*.rb"].each { |file|
@@ -38,10 +40,6 @@ module ActiveScaffold
     ActiveScaffold.autoload_subdir('actions', self)
   end
 
-  module Bridges
-    autoload :Bridge, 'active_scaffold/bridges/bridge'
-  end
-
   module Config
     ActiveScaffold.autoload_subdir('config', self)
   end
@@ -126,7 +124,11 @@ module ActiveScaffold
   end
   
   def self.js_framework
-    @@js_framework ||= :prototype
+    @@js_framework ||= if defined? Jquery
+      :jquery
+    elsif defined? PrototypeRails
+      :prototype
+    end
   end
 
   # exclude bridges you do not need
@@ -150,7 +152,7 @@ module ActiveScaffold
   module ClassMethods
     def active_scaffold(model_id = nil, &block)
       # initialize bridges here
-      ActiveScaffold::Bridges::Bridge.run_all
+      ActiveScaffold::Bridges.run_all
 
       # converts Foo::BarController to 'bar' and FooBarsController to 'foo_bar' and AddressController to 'address'
       model_id = self.to_s.split('::').last.sub(/Controller$/, '').pluralize.singularize.underscore unless model_id
@@ -160,12 +162,6 @@ 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')
@@ -204,12 +200,14 @@ module ActiveScaffold
           end
         end
       end
-      active_scaffold_paths.each do |path|
-        self.append_view_path(ActionView::ActiveScaffoldResolver.new(path))
-      end
+      self.append_view_path active_scaffold_paths
       self._add_sti_create_links if self.active_scaffold_config.add_sti_create_links?
     end
 
+    def parent_prefixes
+      @parent_prefixes ||= super << 'active_scaffold_overrides' << ''
+    end
+
     # To be called after include action modules
     def _add_sti_create_links
       new_action_link = active_scaffold_config.action_links.collection['new']
@@ -268,7 +266,7 @@ module ActiveScaffold
           column.actions_for_association_links.delete :new unless actions.include? :create
           column.actions_for_association_links.delete :edit unless actions.include? :update
           column.actions_for_association_links.delete :show unless actions.include? :show
-          ActiveScaffold::DataStructures::ActionLink.new(nil, options.merge(:html_options => {:class => column.name}))
+          ActiveScaffold::DataStructures::ActionLink.new(:none, options.merge({:crud_type => nil, :html_options => {:class => column.name}}))
         end 
       end
     end
@@ -285,17 +283,10 @@ module ActiveScaffold
       @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
       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.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
@@ -341,7 +332,6 @@ module ActiveScaffold
     def active_scaffold_controller_for(klass)
       controller_namespace = self.to_s.split('::')[0...-1].join('::') + '::'
       error_message = []
-      klass = klass.to_s.singularize.camelize.constantize unless klass.is_a? Class
       [controller_namespace, ''].each do |namespace|
         ["#{klass.to_s.underscore.pluralize}", "#{klass.to_s.underscore.pluralize.singularize}"].each do |controller_name|
           begin
@@ -356,7 +346,7 @@ module ActiveScaffold
             end
           end
           raise ActiveScaffold::ControllerNotFound, "#{controller} missing ActiveScaffold", caller unless controller.uses_active_scaffold?
-          raise ActiveScaffold::ControllerNotFound, "ActiveScaffold on #{controller} is not for #{klass} model.", caller unless controller.active_scaffold_config.model == klass
+          raise ActiveScaffold::ControllerNotFound, "ActiveScaffold on #{controller} is not for #{klass} model.", caller unless controller.active_scaffold_config.model.to_s == klass.to_s
           return controller
         end
       end
@@ -370,17 +360,3 @@ module ActiveScaffold
 end
 
 require 'active_scaffold_env'
-
-##
-## Run the install assets script, too, just to make sure
-## But at least rescue the action in production
-##
-
-Rails::Application.initializer("active_scaffold.install_assets") do
-  begin
-    ActiveScaffoldAssets.copy_to_public(ActiveScaffold.root, {:clean_up_destination => true})
-  rescue
-    raise $! unless Rails.env == 'production'
-  end
-end
-

data/lib/active_scaffold/actions/core.rb

@@ -30,24 +30,28 @@ module ActiveScaffold::Actions
 
     def render_field_for_update_columns
       column = active_scaffold_config.columns[params[:column]]
-      @record = params[:id] && column.send_form_on_update_column ? find_if_allowed(params[:id], :update) : new_model
       unless column.nil?
+        @source_id = params.delete(:source_id)
+        @columns = column.update_columns
+        @scope = params[:scope]
+        
         if column.send_form_on_update_column
-          hash = if params[:scope]
-            hash = params[:scope].gsub('[','').split(']').inject(params[:record]) do |hash, index|
+          hash = if @scope
+            @scope.gsub('[','').split(']').inject(params[:record]) do |hash, index|
               hash[index]
             end
           else
             params[:record]
           end
-          @record = update_record_from_params(@record, active_scaffold_config.send(params[:id] ? :update : :create).columns, hash)
+          @record = hash[:id] ? find_if_allowed(hash[:id], :update) : new_model
+          @record = update_record_from_params(@record, active_scaffold_config.send(@scope ? :subform : (params[:id] ? :update : :create)).columns, hash)
         else
+          @record = new_model
           value = column_value_from_param_value(@record, column, params[:value])
           @record.send "#{column.name}=", value
         end
+        
         after_render_field(@record, column)
-        source_id = params.delete(:source_id)
-        render :locals => {:source_id => source_id, :columns => column.update_columns, :scope => params[:scope]}
       end
     end
     
@@ -66,6 +70,10 @@ module ActiveScaffold::Actions
       end
     end
 
+    def marked_records
+      active_scaffold_session_storage[:marked_records] ||= Set.new
+    end
+    
     def default_formats
       [:html, :js, :json, :xml, :yaml]
     end

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

@@ -36,8 +36,8 @@ module ActiveScaffold::Actions
         @scope = params[:scope]
         
         if column.send_form_on_update_column
-          hash = if @scope
-            @scope.gsub('[','').split(']').inject(params[:record]) do |hash, index|
+          hash = if params[:scope]
+            params[:scope].gsub('[','').split(']').inject(params[:record]) do |hash, index|
               hash[index]
             end
           else
@@ -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.new(build_options || {})
+      model.respond_to?(:build) ? model.build(build_options || {}) : model.new
     end
 
     private

data/lib/active_scaffold/actions/create.rb

@@ -2,9 +2,6 @@ module ActiveScaffold::Actions
   module Create
     def self.included(base)
       base.before_filter :create_authorized_filter, :only => [:new, :create]
-      base.verify :method => :post,
-                  :only => :create,
-                  :redirect_to => { :action => :index }
     end
 
     def new
@@ -42,8 +39,8 @@ module ActiveScaffold::Actions
       else
         if successful?
           flash[:info] = as_(:created_model, :model => @record.to_label)
-          if active_scaffold_config.create.action_after_create
-            redirect_to params_for(:action => "edit", :id => @record.id)
+          if action = active_scaffold_config.create.action_after_create
+            redirect_to params_for(:action => action, :id => @record.id)
           elsif active_scaffold_config.create.persistent
             redirect_to params_for(:action => "new")
           else

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

@@ -2,6 +2,9 @@ module ActiveScaffold::Actions
   module Create
     def self.included(base)
       base.before_filter :create_authorized_filter, :only => [:new, :create]
+      base.verify :method => :post,
+                  :only => :create,
+                  :redirect_to => { :action => :index }
     end
 
     def new
@@ -103,8 +106,6 @@ module ActiveScaffold::Actions
           create_save
         end
       rescue ActiveRecord::RecordInvalid
-        self.successful = false
-        flash[:error] = $!.messages
       end
     end
 

data/lib/active_scaffold/actions/delete.rb

@@ -52,6 +52,7 @@ module ActiveScaffold::Actions
       @record ||= destroy_find_record
       begin
         self.successful = @record.destroy
+        marked_records.delete @record.id.to_s if successful?
       rescue
         flash[:warning] = as_(:cant_destroy_record, :record => @record.to_label)
         self.successful = false

data/lib/active_scaffold/actions/field_search.rb

@@ -42,7 +42,7 @@ module ActiveScaffold::Actions
     end
 
     def do_search
-      unless search_params.nil?
+      unless search_params.blank?
         text_search = active_scaffold_config.field_search.text_search
         search_conditions = []
         human_condition_columns = [] if active_scaffold_config.field_search.human_conditions

data/lib/active_scaffold/actions/list.rb

@@ -55,14 +55,15 @@ module ActiveScaffold::Actions
       render(:partial => 'row', :locals => {:record => @record})
     end
 
-    def row_respond_to_js
-      render(:partial => 'row', :locals => {:record => @record})
+    # The actual algorithm to prepare for the list view
+    def set_includes_for_list_columns
+      includes_for_list_columns = active_scaffold_config.list.columns.collect{ |c| c.includes }.flatten.uniq.compact
+      self.active_scaffold_includes.concat includes_for_list_columns
     end
 
     # The actual algorithm to prepare for the list view
     def do_list
-      includes_for_list_columns = active_scaffold_config.list.columns.collect{ |c| c.includes }.flatten.uniq.compact
-      self.active_scaffold_includes.concat includes_for_list_columns
+      set_includes_for_list_columns
 
       options = { :sorting => active_scaffold_config.list.user.sorting,
         :count_includes => active_scaffold_config.list.user.count_includes }
@@ -75,7 +76,7 @@ module ActiveScaffold::Actions
           })
       end
 
-      page = find_page(options);
+      page = find_page(options)
       if page.items.blank? && !page.pager.infinite?
         page = page.pager.last
         active_scaffold_config.list.user.page = page.number
@@ -173,7 +174,10 @@ module ActiveScaffold::Actions
       (default_formats + active_scaffold_config.formats + active_scaffold_config.list.formats).uniq
     end
     alias_method :index_formats, :list_formats
-    alias_method :row_formats, :list_formats
+
+    def row_formats
+      ([:html] + active_scaffold_config.formats + active_scaffold_config.list.formats).uniq
+    end
 
     def action_update_formats
       (default_formats + active_scaffold_config.formats).uniq