active_scaffold 3.2.11 → 3.2.12

data/config/locales/fr.yml

@@ -31,8 +31,10 @@ fr:
     filtered: '(Filtré)'
     found: 'Trouvé'
     hide: 'Cacher'
+    inplace_edit_handle: '--'
     live_search: 'Recherche en temps réel'
     loading: 'Chargement…'
+    mark_all_records: "Mark all"
     next: 'Suivant'
     no_entries: "Pas d'entrée"
     no_options: "pas d'option"
@@ -41,6 +43,9 @@ fr:
     pdf: 'PDF'
     previous: 'Précédent'
     print: 'Imprimer'
+    records_marked:
+      one: "1 marked %{model}"
+      other: "%{count} marked %{model}"
     refresh: 'Rafraîchir'
     remove: 'Supprimer'
     remove_file: 'Supprimer et remplacer le fichier'

data/config/locales/hu.yml

@@ -31,8 +31,10 @@ hu:
     filtered: '(Szűrt)'
     found: 'Találat'
     hide: 'Elrejtés'
+    inplace_edit_handle: '--'
     live_search: 'Élő keresés'
     loading: 'Betöltés…'
+    mark_all_records: "Mark all"
     next: 'Következő'
     no_entries: 'Nincs elem'
     no_options: 'nincsenek opciók'
@@ -41,6 +43,9 @@ hu:
     pdf: 'PDF'
     previous: 'Előző'
     print: 'Nyomtatás'
+    records_marked:
+      one: "1 marked %{model}"
+      other: "%{count} marked %{model}"
     refresh: 'Frissítés'
     remove: 'Törlés'
     remove_file: 'Fájl törlése, vagy cseréje'

data/config/locales/ja.yml

@@ -31,8 +31,10 @@ ja:
     filtered: '（フィルタ中）'
     found: '個ありました'
     hide: '隠す'
+    inplace_edit_handle: '--'
     live_search: 'その場で検索'
     loading: '読み込み中…'
+    mark_all_records: "Mark all"
     next: '次'
     no_entries: '見つかりませんでした'
     no_options: 'オプション無し'
@@ -41,6 +43,9 @@ ja:
     pdf: 'PDF'
     previous: '前'
     print: '印刷'
+    records_marked:
+      one: "1 marked %{model}"
+      other: "%{count} marked %{model}"
     refresh: 'Refresh' # needed?
     remove: '削除'
     remove_file: 'ファイルを削除または置換'

data/config/locales/ru.yml

@@ -35,8 +35,10 @@ ru:
       many: 'записей'
       other: 'записи'
     hide: 'Скрыть'
+    inplace_edit_handle: '--'
     live_search: 'Поиск'
     loading: 'Загрузка…'
+    mark_all_records: "Mark all"
     next: 'Следующее'
     no_entries: 'Нет записей'
     no_options: 'Нет вариантов'
@@ -45,6 +47,9 @@ ru:
     pdf: 'PDF'
     previous: 'Предыдущее'
     print: 'Печать'
+    records_marked:
+      one: "1 marked %{model}"
+      other: "%{count} marked %{model}"
     refresh: 'Обновить'
     remove: 'Удалить'
     remove_file: 'Удалить или заменить файл'

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

@@ -10,8 +10,8 @@ subform_div_id = "#{sub_form_id({:association => column.name, :id => parent_reco
 <h5><%= column.label -%></h5>
 <div id ="<%= subform_div_id %>" <%= 'style="display: none;"'.html_safe if column.collapsed -%>>
 <%# HACK to be able to delete all associated records %>
-<%= hidden_field_tag "#{active_scaffold_input_options(column)[:name]}[0]", '' if column.plural_association? %>
-<%= render :partial => subform_partial_for_column(column), :locals => {:column => column, :parent_record => parent_record, :associated => associated, :show_blank_record => show_blank_record} %>
+<%= hidden_field_tag "#{active_scaffold_input_options(column, scope)[:name]}[0]", '' if column.plural_association? %>
+<%= render :partial => subform_partial_for_column(column), :locals => {:column => column, :parent_record => parent_record, :associated => associated, :show_blank_record => show_blank_record, :scope => scope} %>
 </div>
 <%= link_to_visibility_toggle(subform_div_id, {:default_visible => !column.collapsed}) -%>
 <% @record = parent_record -%>

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

@@ -11,8 +11,8 @@ show_add_new = column_show_add_new(column, associated, @record)
 
 return unless show_add_new or show_add_existing
 
-edit_associated_url = url_for(:action => 'edit_associated', :id => parent_record.id, :association => column.name, :associated_id => '--ID--', :eid => params[:eid], :parent_controller => params[:parent_controller], :parent_id => params[:parent_id]) if show_add_existing
-add_new_url = url_for(:action => 'edit_associated', :id => parent_record.id, :association => column.name, :eid => params[:eid], :parent_controller => params[:parent_controller], :parent_id => params[:parent_id]) if show_add_new
+edit_associated_url = params_for(:action => 'edit_associated', :child_association => column.name, :associated_id => '--ID--', :scope => scope) if show_add_existing
+add_new_url = params_for(:action => 'edit_associated', :child_association => column.name, :scope => scope) if show_add_new
 
 -%>
 <div class="footer-wrapper">

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

@@ -12,11 +12,11 @@
       </td>
     </tr>
     <% end %>
-    <%= render :partial => 'horizontal_subform_record', :locals => {:scope => column_scope(column), :parent_record => parent_record, :column => column, :locked => show_blank_record && @record.new_record? && @record == associated.last} %>
+    <%= render :partial => 'horizontal_subform_record', :locals => {:scope => column_scope(column, scope), :parent_record => parent_record, :column => column, :locked => show_blank_record && @record.new_record? && @record == associated.last} %>
     <% end -%>
   </tbody>
   <tfoot>
-    <%= render :partial => 'horizontal_subform_footer', :locals => {:scope => column_scope(column), :parent_record => parent_record, :column => column} %>
+    <%= render :partial => 'horizontal_subform_footer', :locals => {:scope => column_scope(column, scope), :parent_record => parent_record, :column => column} %>
   </tfoot>
 </table>
-<%= render :partial => 'form_association_footer', :locals => {:parent_record => parent_record, :column => column, :associated => associated} -%>
+<%= render :partial => 'form_association_footer', :locals => {:parent_record => parent_record, :column => column, :associated => associated, :scope => scope} -%>

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

@@ -1,8 +1,11 @@
 <%
-  column_count = if nested? and action_name == 'index'
-    active_scaffold_config_for(nested.parent_model).list.columns.count + 1
-  else
-    active_scaffold_config.list.columns.count + 1
+  column_count ||= begin
+    config = if nested? and (nested.singular_association? || action_name == 'index')
+      active_scaffold_config_for(nested.parent_model)
+    else
+      active_scaffold_config
+    end
+    config.list.columns.count + 1
   end
 %>
 <%# nested_id, allows us to remove a nested scaffold programmatically %>

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

@@ -1,6 +1,7 @@
+<% column_count ||= columns.length + 1 -%>
 <tbody class="messages">
   <tr class="record even-record">
-    <td colspan="<%= columns.length + 1 -%>" class="messages-container">
+    <td colspan="<%= column_count -%>" class="messages-container">
       <p class="error-message message server-error" style="display:none;">
         <%= as_(:internal_error).html_safe %>
         <a href="#" class="close" title="<%= as_(:close).html_safe %>"><%= as_(:close).html_safe %></a>

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

@@ -1,7 +1,7 @@
 <% for name in [:info, :warning, :error] %>
   <% if flash[name] %>
     <div class="<%= "#{name}-message message" %>">
-      <%= h flash[name] %>
+      <%= display_message flash[name] %>
       <% if request.xhr? %>
         <a href="#" class="close" title="<%= as_(:close) %>"><%= as_(:close) %></a>
       <% end %>

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

@@ -1,6 +1 @@
-<%= render :partial => 'list_record', :locals => {:record => record}%>
-<%= javascript_tag do %>
-  <%= render :partial => 'update_calculations', :formats => [:js] %>
-<% end %>
-
-
+<%= render :partial => 'list_record', :locals => {:record => record} %>

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

@@ -6,7 +6,7 @@
     <%= active_scaffold_error_messages_for :record, :object_name => @record.class.model_name.human.downcase %>
   </div>
   <% end %>
-  <%= render :partial => 'vertical_subform_record', :locals => {:scope => column_scope(column), :parent_record => parent_record, :column => column, :locked => show_blank_record && @record.new_record? && @record == associated.last} %>
+  <%= render :partial => 'vertical_subform_record', :locals => {:scope => column_scope(column, scope), :parent_record => parent_record, :column => column, :locked => show_blank_record && @record.new_record? && @record == associated.last} %>
   <% end -%>
 </div>
-<%= render :partial => 'form_association_footer', :locals => {:parent_record => parent_record, :column => column, :associated => associated} -%>
+<%= render :partial => 'form_association_footer', :locals => {:parent_record => parent_record, :column => column, :associated => associated, :scope => scope} -%>

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

@@ -1,7 +1,7 @@
 <% 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 %>);
 
-<%= render :partial => 'update_calculations' %>
+<%= render :partial => 'update_calculations', :formats => [:js] %>
 
 <% 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.%>

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

@@ -6,7 +6,7 @@
       <% current_id = controller_id(params[:eid] || params[:parent_sti]) -%>
       ActiveScaffold.delete_record_row('<%= element_row_id(:controller_id => current_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)) %>');
       <% messages_id = active_scaffold_messages_id(:controller_id => current_id) %>
-      <%= render :partial => 'update_calculations', :locals => {:calculations_id => active_scaffold_calculations_id(:controller_id => current_id)} %>
+      <%= render :partial => 'update_calculations', :locals => {:calculations_id => active_scaffold_calculations_id(:controller_id => current_id)}, :formats => [:js] %>
     <% elsif render_parent_action == :index %>
       <% if controller.respond_to?(:render_component_into_view) %>
         <%= escape_javascript(controller.send(:render_component_into_view, render_parent_options)) %>
@@ -18,7 +18,7 @@
     <%= render :partial => 'refresh_list' %>
   <% 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)) %>');
-    <%= render :partial => 'update_calculations' %>
+    <%= render :partial => 'update_calculations', :formats => [:js] %>
   <% 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) %>

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

@@ -8,7 +8,7 @@
       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' %>
+    <%= render :partial => 'update_calculations', :formats => [:js] %>
   <% else %>
     <% if @action_link.nil? || @action_link.position %>
       ActiveScaffold.find_action_link('<%= element_row_id(:action => action_name) %>').close();

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

@@ -5,23 +5,9 @@ var action_link = ActiveScaffold.find_action_link('<%= form_selector%>');
 action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'messages'))%>');
 <% if controller.send :successful? %>
   <% if render_parent? %>
-    <% if 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 %>
-      <%= render :partial => 'update_calculations', :locals => {:calculations_id => active_scaffold_calculations_id(:controller_id => render_parent_controller)} unless render_parent_action == :index %>
+    <% if nested_singular_association? || render_parent_action == :row %>
+      action_link.close(true);
     <% else %>
-      <% if nested_singular_association? || render_parent_action == :row %>
-        action_link.close();
-      <% end %>
       ActiveScaffold.reload('<%= url_for render_parent_options %>');
     <% end %>
   <% elsif (active_scaffold_config.create.refresh_list) %>
@@ -29,7 +15,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' %>
+    <%= render :partial => 'update_calculations', :formats => [:js] %>
   <% end %>
 
   <% unless render_parent? %>

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

@@ -0,0 +1,6 @@
+<%
+  checked = all_marked? unless local_assigns.has_key? :checked
+  options = {:checked => checked, :include_mark_all => true, :include_checkboxes => params[:id].nil?}
+%>
+ActiveScaffold.mark_records('<%= active_scaffold_tbody_id %>',<%= options.to_json.html_safe %>);
+<%= render :partial => 'update_messages' %>

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

@@ -5,26 +5,17 @@ action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'mes
 <% if controller.send :successful? %>
   <% if !active_scaffold_config.update.persistent %>
     <% if render_parent? %>
-      <% if controller.respond_to?(:render_component_into_view) %>
-        <% parent_rendered = controller.send(:render_component_into_view, render_parent_options) %>
-        <% if nested_singular_association? || render_parent_action == :row %>
-          action_link.close('<%= escape_javascript(parent_rendered) %>');
-          <%= render :partial => 'update_calculations', :locals => {:calculations_id => active_scaffold_calculations_id(:controller_id => render_parent_controller)} %>
-        <% elsif render_parent_action == :index %>
-          <%= escape_javascript(parent_rendered) %>
-        <% end %>
+      <% if nested_singular_association? || render_parent_action == :row %>
+        action_link.close(true);
       <% else %>
-        <% if nested_singular_association? || render_parent_action == :row %>
-          action_link.close();
-	<% end %>
-	ActiveScaffold.reload('<%= url_for render_parent_options %>');
+        ActiveScaffold.reload('<%= url_for render_parent_options %>');
       <% end %>
     <% elsif update_refresh_list? %>
       <%= render :partial => 'refresh_list' %>
     <% else %>
       <% updated_row = render :partial => 'list_record', :locals => {:record => @record} %>
       action_link.close('<%= escape_javascript(updated_row) %>');
-      <%= render :partial => 'update_calculations' %>
+      <%= render :partial => 'update_calculations', :formats => [:js] %>
     <% end %>
   <% end %>
 <% else %>

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

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

data/lib/active_scaffold.rb

@@ -70,6 +70,7 @@ module ActiveScaffold
 
     base.helper_method :touch_device?
     base.helper_method :hover_via_click?
+    base.helper_method :active_scaffold_constraints
   end
 
   def self.set_defaults(&block)

data/lib/active_scaffold/actions/core.rb

@@ -150,14 +150,16 @@ module ActiveScaffold::Actions
         
     # Builds search conditions by search params for column names. This allows urls like "contacts/list?company_id=5".
     def conditions_from_params
-      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] = value
+      @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
+        end
+        conditions
       end
-      conditions
     end
 
     def new_model

data/lib/active_scaffold/actions/create.rb

@@ -122,7 +122,7 @@ module ActiveScaffold::Actions
     end
     
     def create_authorized?
-      (!nested? || !nested.readonly?) && authorized_for?(:crud_type => :create)
+      (!nested? || !nested.readonly? || !nested.through?) && authorized_for?(:crud_type => :create)
     end
     private
     def create_authorized_filter

data/lib/active_scaffold/actions/delete.rb

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

data/lib/active_scaffold/actions/list.rb

@@ -11,7 +11,7 @@ module ActiveScaffold::Actions
 
     # get just a single row
     def row
-      @record = find_if_allowed(params[:id], :read)
+      get_row
       respond_to_action(:row)
     end
 
@@ -50,8 +50,8 @@ module ActiveScaffold::Actions
       render :text => Hash.from_xml(response_object.to_xml(:only => list_columns_names)).to_yaml, :content_type => Mime::YAML, :status => response_status
     end
     
-    def row_respond_to_html
-      render(:partial => 'row', :locals => {:record => @record})
+    def row_respond_to_js
+      render
     end
 
     # The actual algorithm to prepare for the list view
@@ -59,6 +59,12 @@ module ActiveScaffold::Actions
       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
+    
+    def get_row
+      set_includes_for_list_columns
+      klass = beginning_of_chain.includes(active_scaffold_includes)
+      @record = find_if_allowed(params[:id], :read, klass)
+    end
 
     # The actual algorithm to prepare for the list view
     def do_list
@@ -76,7 +82,8 @@ module ActiveScaffold::Actions
       end
 
       page = find_page(options)
-      if page.items.blank? && !page.pager.infinite?
+      total_pages = page.pager.number_of_pages
+      if !page.pager.infinite? && !total_pages.zero? && page.number > total_pages
         page = page.pager.last
         active_scaffold_config.list.user.page = page.number
       end

data/lib/active_scaffold/actions/mark.rb

@@ -3,58 +3,69 @@ module ActiveScaffold::Actions
 
     def self.included(base)
       base.before_filter :mark_authorized?, :only => :mark
-      #base.prepend_before_filter :assign_marked_records_to_model
+      base.prepend_before_filter :assign_marked_records_to_model
       base.helper_method :marked_records
     end
 
-    def mark_all
-      if mark_all? || mark_all_scope_forced?
-        do_mark_all
+    def mark
+      if mark? || mark_all_scope_forced?
+        do_mark
       else
-        do_unmark
+        do_demark
       end
-      do_list
-      respond_to_action(:mark_all)
+      if marked_records.length > 0
+        link = "<a href=\"#{url_for(:action=>:mark, :id=>'', :mark_target => :scope)}\" data-method=\"post\" data-remote=\"true\">#{as_ :mark_all_records}</a>"
+        count = marked_records.length
+        flash[:info] = as_(:records_marked, :count => count, :model => active_scaffold_config.label(:count => count), :link => link)
+      end
+      respond_to_action(:mark)
     end
     protected
 
-    def mark_all_respond_to_html
+    def mark_respond_to_html
+      do_list
       list_respond_to_html
     end
 
-    def mark_all_respond_to_js
-      render :action => 'on_mark_all', :locals => {:mark_all => mark_all?}
+    def mark_respond_to_js
+      if params[:id]
+        do_search if respond_to? :do_search
+        set_includes_for_list_columns
+        @page = find_page(:pagination => active_scaffold_config.mark.mark_all_mode != :page)
+        render :action => 'on_mark'
+      else
+        render :action => 'on_mark', :locals => {:checked => mark?}
+      end
     end
  
     # We need to give the ActiveRecord classes a handle to currently marked records. We don't want to just pass the object,
-    # because the object may change. So we give ActiveRecord a proc that ties to the
-    # marked_records_method on this ApplicationController.
+    # because the object may change. So we give ActiveRecord a proc that ties to the marked_records_method on this ApplicationController.
     def assign_marked_records_to_model
       active_scaffold_config.model.marked_records = marked_records
     end
 
     def mark?
-      params[:value] == 'true'
-    end
-    
-    def mark_all?
-      @mark_all ||= [true, 'true', 1, '1', 'T', 't'].include?(params[:value].class == String ? params[:value].downcase : params[:value])
+      @mark ||= [true, 'true', 1, '1', 'T', 't'].include?(params[:value].class == String ? params[:value].downcase : params[:value])
     end
 
     def mark_all_scope_forced?
-      !params[:mark_target].nil? && params[:mark_target]=='scope'
+      params[:mark_target] == 'scope' unless params[:id]
     end
-    
-    def do_mark_all
-      if active_scaffold_config.mark.mark_all_mode == :page && !mark_all_scope_forced? then
+
+    def do_mark
+      if params[:id]
+        find_if_allowed(params[:id], :read).as_marked = true
+      elsif active_scaffold_config.mark.mark_all_mode == :page && !mark_all_scope_forced?
         each_record_in_page {|record| marked_records << record.id}
       else
         each_record_in_scope {|record| marked_records << record.id}
       end
     end
 
-    def do_demark_all
-      if active_scaffold_config.mark.mark_all_mode == :page then
+    def do_demark
+      if params[:id]
+        find_if_allowed(params[:id], :read).as_marked = false
+      elsif active_scaffold_config.mark.mark_all_mode == :page
         each_record_in_page {|record| marked_records.delete(record.id)}
       else
         each_record_in_scope {|record| marked_records.delete(record.id)}
@@ -67,7 +78,7 @@ module ActiveScaffold::Actions
       authorized_for?(:crud_type => :read)
     end
 
-    def mark_all_formats
+    def mark_formats
       (default_formats + active_scaffold_config.formats).uniq
     end
   end