active_scaffold 3.2.20 → 3.3.0.rc

data/app/views/active_scaffold_overrides/_update_actions.html.erb

@@ -0,0 +1,9 @@
+<div class="active-scaffold-header">
+  <div class="actions">
+    <% active_scaffold_config.action_links.member.each do |link| -%>
+      <% next unless link.action == 'index' -%>
+      <% next if skip_action_link?(link, record) || !action_link_authorized?(link, record) -%>
+      <%= render_action_link(link, record, :authorized => true) -%>
+    <% end -%>
+  </div>
+</div>

data/app/views/active_scaffold_overrides/_update_column.js.erb

@@ -0,0 +1,16 @@
+<%
+  column = if update_column.is_a? ActiveScaffold::DataStructures::Column
+    update_column
+  else
+    active_scaffold_config.columns[update_column.to_sym]
+  end
+  @rendered ||= Set.new
+  return if @rendered.include? column.name
+  @rendered << column.name
+-%>
+<% if @record.authorized_for?(:crud_type => :read, :column => column.name) -%>
+  ActiveScaffold.replace_html('<%= row_id %> .<%= column.name %>-column','<%= escape_javascript(render_list_column(get_column_value(@record, column), column, @record)) %>');
+<% end -%>
+<% if column.update_columns && !column.update_columns.empty? %>
+  <%=  render(:partial => 'update_column', :collection => column.update_columns & active_scaffold_config.list.columns.names, :locals => {:row_id => row_id})%>
+<% end %>

data/app/views/active_scaffold_overrides/_vertical_subform.html.erb

@@ -0,0 +1,8 @@
+<div id="<%= sub_form_list_id(:association => column.name) %>">
+  <% associated.each_index do |index| %>
+  <div class="sub-form-record">
+  <% @record = associated[index] -%>
+  <%= render :partial => 'form_association_record', :locals => {:scope => column_scope(column, scope), :parent_record => parent_record, :column => column, :locked => show_blank_record && @record.new_record? && @record == associated.last, :index => index} %>
+  </div>
+  <% end -%>
+</div>

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

@@ -1,5 +1,5 @@
 <%
-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?}
+associated_form = render :partial => "form_association_record", :locals => {:scope => @scope, :parent_record => @parent_record, :column => @column, :locked => @record.new_record? && @column.singular_association?}
 options = {:singular => false}
 if @column.singular_association?
   options[:singular] = true

data/{frontends/default/views → app/views/active_scaffold_overrides}/on_action_update.js.erb

@@ -2,15 +2,15 @@
   <% if @record %>
     <%= render :partial => 'update_messages' %>
     <% row = escape_javascript(render(:partial => 'list_record', :locals => {:record => @record})) -%>
-    <% if @action_link.nil? || @action_link.position %>
-      ActiveScaffold.find_action_link('<%= element_row_id(:action => :list, :id => @record.id) %>').close('<%= row %>');
+    <% if @action_link.try(:position) %>
+      ActiveScaffold.find_action_link('<%= element_form_id(:action => action_name) %>').close('<%= row %>');
     <% else %>
       ActiveScaffold.update_row('<%= element_row_id(:action => :list, :id => @record.id) %>', '<%= row %>');
       ActiveScaffold.scroll_to('<%= element_row_id(:action => :list, :id => @record.id) %>', true);
     <% end %>
     <%= render :partial => 'update_calculations', :formats => [:js] %>
   <% else %>
-    <% if @action_link.nil? || @action_link.position %>
+    <% if @action_link.try(:position) %>
       ActiveScaffold.find_action_link('<%= element_row_id(:action => action_name) %>').close();
     <% end %>
     <%= render :partial => 'refresh_list' %>

data/{frontends/default/views → app/views/active_scaffold_overrides}/on_create.js.erb

@@ -17,7 +17,7 @@ action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'mess
   <% 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 %>);
-    <%= render :partial => 'update_calculations.js' %>
+    <%= render :partial => 'update_calculations', :formats => [:js] %>
   <% end %>
 
   <% unless render_parent? %>

data/{frontends/default/views → app/views/active_scaffold_overrides}/on_update.js.erb

@@ -1,13 +1,13 @@
 try {
-<% form_selector = "#{element_form_id(:action => :update)}" %>
+<% form_selector = "#{element_form_id(:action => :update, :id => @record.id)}" %>
 var action_link = ActiveScaffold.find_action_link('<%= form_selector %>');
 action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'messages')) %>');
 <% if controller.send :successful? %>
   <% if params[:dont_close] %>
     <% row_selector = element_row_id(:action => :list, :id => @record.id) %>
     ActiveScaffold.update_row('<%= row_selector %>', '<%= escape_javascript(render(:partial => 'list_record', :locals => {:record => @record})) %>');
-    <%= render :partial => 'update_calculations.js' %>
-    ActiveScaffold.scroll_to('<%= row_selector %>', true);
+    action_link.target = $('#<%= row_selector %>');
+    <%= render :partial => 'update_calculations', :formats => [:js] %>
   <% else %>
     <% if render_parent? %>
       <% if nested_singular_association? || render_parent_action == :row %>
@@ -19,7 +19,7 @@ action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'mes
       <%= render :partial => 'refresh_list' %>
     <% else %>
       action_link.close('<%= escape_javascript(render(:partial => 'list_record', :locals => {:record => @record})) %>');
-      <%= render :partial => 'update_calculations.js' %>
+      <%= render :partial => 'update_calculations', :formats => [:js] %>
     <% end %>
   <% end %>
 <% else %>

data/{frontends/default/views → app/views/active_scaffold_overrides}/row.js.erb

@@ -1,2 +1,2 @@
-ActiveScaffold.update_row('<%= element_row_id(:action => :list) %>', '<%= escape_javascript render(:partial => 'row', :locals => {:record => @record}) %>');
+ActiveScaffold.update_row('<%= element_row_id(:action => :list) %>', '<%= escape_javascript render('row', :record => @record) %>');
 <%= render :partial => 'update_calculations', :formats => [:js] %>

data/{frontends/default/views → app/views/active_scaffold_overrides}/update.html.erb

@@ -1,7 +1,7 @@
 <div class="active-scaffold">
   <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)} %>
+    <%= render :partial => 'update_actions', :locals => {:record => @record} %>
     <% end -%>
     <%= render :partial => 'update_form' -%>
   </div>

data/app/views/active_scaffold_overrides/update_column.js.erb

@@ -0,0 +1,26 @@
+<% @column_span_id ||= element_cell_id(:id => @record.id.to_s, :action => 'update_column', :name => @column.name) -%>
+<% unless controller.send :successful? -%>
+  alert('<%= escape_javascript(@record.errors.full_messages.join("\n")) %>');
+  <% @record.reload -%>
+<% end -%>
+<% if @column.inplace_edit
+     ipe_update = @column.inplace_edit_update if controller.send :successful? -%>
+  <% case ipe_update
+     when :row -%>
+       ActiveScaffold.update_row('<%= element_row_id(:action => :list) %>', '<%= escape_javascript render('row', :record => @record) %>');
+  <% when :table -%>
+       ActiveScaffold.replace_html('<%= active_scaffold_content_id %>', '<%= escape_javascript(render('list')) %>');
+  <% else
+       formatted_value = get_column_value(@record, @column) -%>
+       ActiveScaffold.update_inplace_edit('<%= @column_span_id %>','<%= escape_javascript(formatted_value) %>', <%= column_empty?(formatted_value).to_json %>);
+    <% if ipe_update == :columns && @column.update_columns && !@column.update_columns.empty?
+         @rendered = Set.new([@column.name]) -%>
+         <%= render :partial => 'update_column', :collection => @column.update_columns & active_scaffold_config.list.columns.names, :locals => {:row_id => element_row_id(:action => :list, :id => @record.id)} %>
+    <% end %>
+  <% end -%>
+<% else -%>
+  ActiveScaffold.replace_html('<%= @column_span_id %>','<%= escape_javascript(get_column_value(@record, @column)) %>');
+<% end -%>
+<% if @column.calculation? -%>
+  ActiveScaffold.replace_html('<%= active_scaffold_calculations_id(:column => @column) %>', '<%= escape_javascript(render_column_calculation(@column)) %>');
+<% end -%>

data/config/locales/de.yml

@@ -50,6 +50,7 @@ de:
     refresh: 'Neu laden'
     remove: 'Entfernen'
     remove_file: 'Entferne oder Ersetze Datei'
+    replace_existing: 'Existierenden ersetzen'
     replace_with_new: 'Mit Neuer ersetzen'
     revisions_for_model: 'Revisionen für %{model}'
     reset: 'Zurücksetzen'

data/config/locales/en.yml

@@ -50,6 +50,7 @@ en:
     refresh: 'Refresh'
     remove: 'Remove'
     remove_file: 'Remove or Replace file'
+    replace_existing: 'Replace Existing'
     replace_with_new: 'Replace With New'
     revisions_for_model: 'Revisions for %{model}'
     reset: 'Reset'

data/config/locales/es.yml

@@ -52,6 +52,7 @@ es:
     refresh: 'Recargar'
     remove: 'Eliminar'
     remove_file: 'Eliminar o Reemplazar archivo'
+    replace_existing: 'Reemplazar existente'
     replace_with_new: 'Reemplazar con Nuevo'
     revisions_for_model: 'Revisiones de %{model}'
     reset: 'Restaurar'

data/config/locales/fr.yml

@@ -50,6 +50,7 @@ fr:
     refresh: 'Rafraîchir'
     remove: 'Supprimer'
     remove_file: 'Supprimer et remplacer le fichier'
+    replace_existing: 'Remplacer existant(e)'
     replace_with_new: 'Remplacer avec le nouveau'
     revisions_for_model: 'Révision pour %{model}'
     reset: 'Annuler'

data/config/locales/hu.yml

@@ -50,6 +50,7 @@ hu:
     refresh: 'Frissítés'
     remove: 'Törlés'
     remove_file: 'Fájl törlése, vagy cseréje'
+    replace_existing: 'Replace existing'
     replace_with_new: 'Csere újjal'
     revisions_for_model: '%{model} revíziói'
     reset: 'Alapállapot'

data/config/locales/ja.yml

@@ -50,6 +50,7 @@ ja:
     refresh: 'Refresh' # needed?
     remove: '削除'
     remove_file: 'ファイルを削除または置換'
+    replace_existing: 'Replace existing'
     replace_with_new: '新しいもので置換'
     revisions_for_model: 'Revisions for %{model}' # neede?
     reset: 'リセット'

data/config/locales/ru.yml

@@ -56,6 +56,7 @@ ru:
     refresh: 'Обновить'
     remove: 'Удалить'
     remove_file: 'Удалить или заменить файл'
+    replace_existing: 'Replace existing'
     replace_with_new: 'Заменить новым'
     revisions_for_model: '%{model}: редакции'
     reset: 'Сброс'

data/lib/active_scaffold.rb

@@ -16,7 +16,6 @@ require 'active_scaffold/engine' unless defined? ACTIVE_SCAFFOLD_PLUGIN
 require 'json'  # for js_config
 
 module ActiveScaffold
-  METHOD_CONVERSION = RUBY_VERSION < '1.9' ? :to_s : :to_sym
   autoload :AttributeParams, 'active_scaffold/attribute_params'
   autoload :Configurable, 'active_scaffold/configurable'
   autoload :Constraints, 'active_scaffold/constraints'
@@ -163,6 +162,7 @@ module ActiveScaffold
 
   module ClassMethods
     def active_scaffold(model_id = nil, &block)
+      extend Prefixes
       # initialize bridges here
       ActiveScaffold::Bridges.run_all
 
@@ -173,16 +173,7 @@ module ActiveScaffold
       @active_scaffold_config = ActiveScaffold::Config::Core.new(model_id)
       @active_scaffold_config_block = block
       self.links_for_associations
-
-      @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')
-        @active_scaffold_frontends << active_scaffold_custom_frontend_path
-      end
-      active_scaffold_default_frontend_path = File.join(ActiveScaffold::Config::Core.plugin_directory, 'frontends', 'default' , 'views')
-      @active_scaffold_frontends << active_scaffold_default_frontend_path
-      @active_scaffold_custom_paths = []
-
+      
       self.active_scaffold_superclasses_blocks.each {|superblock| self.active_scaffold_config.configure &superblock}
       self.active_scaffold_config.sti_children = nil # reset sti_children if set in parent block
       self.active_scaffold_config.configure &block if block_given?
@@ -212,12 +203,13 @@ module ActiveScaffold
           end
         end
       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' << ''
+    module Prefixes
+      def parent_prefixes
+        @parent_prefixes ||= super << 'active_scaffold_overrides'
+      end
     end
 
     # To be called after include action modules
@@ -265,7 +257,7 @@ module ActiveScaffold
       controller = active_scaffold_controller_for_column(column, options)
       
       unless controller.nil?
-        options.reverse_merge! :label => column.label, :position => :after, :type => :member, :controller => (controller == :polymorph ? controller : controller.controller_path), :column => column
+        options.reverse_merge! :position => :after, :type => :member, :controller => (controller == :polymorph ? controller : controller.controller_path), :column => column
         options[:parameters] ||= {}
         options[:parameters].reverse_merge! :association => column.association.name
         if column.plural_association?
@@ -291,17 +283,13 @@ module ActiveScaffold
     end
 
     def add_active_scaffold_path(path)
-      @active_scaffold_paths = nil # Force active_scaffold_paths to rebuild
-      @active_scaffold_custom_paths << path
-    end
-
-    def active_scaffold_paths
-      return @active_scaffold_paths unless @active_scaffold_paths.nil?
-
-      @active_scaffold_paths = []
-      @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
+      as_path = File.join(ActiveScaffold::Config::Core.plugin_directory, 'app', 'views')
+      index = view_paths.find_index { |p| p.to_s == as_path }
+      if index
+        self.view_paths = view_paths[0..index-1] + Array(path) + view_paths[index..-1]
+      else
+        append_view_path path
+      end
     end
 
     def active_scaffold_config

data/lib/active_scaffold/actions/core.rb

@@ -11,7 +11,7 @@ module ActiveScaffold::Actions
       base.helper_method :new_model
     end
     def render_field
-      if params[:in_place_editing]
+      if request.get?
         render_field_for_inplace_editing
       else
         render_field_for_update_columns
@@ -28,16 +28,17 @@ module ActiveScaffold::Actions
     end
 
     def render_field_for_inplace_editing
-      @record = find_if_allowed(params[:id], :update)
+      @record = find_if_allowed(params[:id], :crud_type => :update, :column => params[:update_column])
       render :inline => "<%= active_scaffold_input_for(active_scaffold_config.columns[params[:update_column].to_sym]) %>"
     end
 
     def render_field_for_update_columns
-      column = active_scaffold_config.columns[params[:column]]
+      column = active_scaffold_config.columns[params.delete(:column)]
       unless column.nil?
         @source_id = params.delete(:source_id)
         @columns = column.update_columns
-        @scope = params[:scope]
+        @scope = params.delete(:scope)
+        @main_columns = active_scaffold_config.send(@scope ? :subform : (params[:id] ? :update : :create)).columns
         
         if column.send_form_on_update_column
           if @scope
@@ -50,10 +51,10 @@ module ActiveScaffold::Actions
             id = params[:id]
           end
           @record = id ? find_if_allowed(id, :update) : new_model
-          @record = update_record_from_params(@record, active_scaffold_config.send(@scope ? :subform : (id ? :update : :create)).columns, hash)
+          @record = update_record_from_params(@record, @main_columns, hash)
         else
           @record = new_model
-          value = column_value_from_param_value(@record, column, params[:value])
+          value = column_value_from_param_value(@record, column, params.delete(:value))
           @record.send "#{column.name}=", value
         end
         
@@ -157,11 +158,13 @@ module ActiveScaffold::Actions
     def conditions_from_params
       @conditions_from_params ||= begin
         conditions = {}
-        params.reject {|key, value| [:controller, :action, :id, :page, :sort, :sort_direction].include?(key.to_sym)}.each do |key, value|
-          next unless active_scaffold_config.model.columns_hash[key.to_s]
-          next if active_scaffold_constraints[key.to_sym]
-          next if nested? and nested.constrained_fields.include? key.to_sym
-          conditions[key.to_sym] = value
+        params.except(:controller, :action, :page, :sort, :sort_direction).each do |key, value|
+          column = active_scaffold_config.model.columns_hash[key.to_s]
+          key = key.to_sym
+          next unless column
+          next if active_scaffold_constraints[key]
+          next if nested? and nested.param_name == key
+          conditions[key] = column.type_cast(value)
         end
         conditions
       end

data/lib/active_scaffold/actions/create.rb

@@ -34,7 +34,7 @@ module ActiveScaffold::Actions
     def create_respond_to_html
       if params[:iframe]=='true' # was this an iframe post ?
         responds_to_parent do
-          render :action => 'on_create.js', :layout => false
+          render :action => 'on_create', :formats => [:js], :layout => false
         end
       else
         if successful?
@@ -92,7 +92,7 @@ module ActiveScaffold::Actions
           apply_constraints_to_record(@record, :allow_autosave => true)
           create_association_with_parent(@record) if nested?
           before_create_save(@record)
-          self.successful = [@record.valid?, @record.associated_valid?].all? {|v| v == true} # this syntax avoids a short-circuit
+          self.successful = [@record.valid?, @record.associated_valid?].all? # this syntax avoids a short-circuit
           create_save(@record) unless options[:skip_save]
         end
       rescue ActiveRecord::ActiveRecordError => ex
@@ -122,7 +122,7 @@ module ActiveScaffold::Actions
     end
     
     def create_authorized?
-      (!nested? || !nested.readonly? || !nested.through?) && authorized_for?(:crud_type => :create)
+      !(nested? && (nested.readonly? || nested.readonly_through_association?)) && authorized_for?(:crud_type => :create)
     end
     private
     def create_authorized_filter

data/lib/active_scaffold/actions/delete.rb

@@ -62,6 +62,9 @@ module ActiveScaffold::Actions
     def delete_authorized?(record = nil)
       (!nested? || !nested.readonly?) && (record || self).send(:authorized_for?, :crud_type => :delete)
     end
+    def delete_ignore?(record = nil)
+      (nested? && nested.readonly?) || !self.send(:authorized_for?, :crud_type => :delete)
+    end
     private
     def delete_authorized_filter
       link = active_scaffold_config.delete.link || active_scaffold_config.delete.class.link