active_scaffold 3.0.5 → 3.0.11

data/lib/active_scaffold/helpers/controller_helpers.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Helpers
     module ControllerHelpers
       def self.included(controller)
-        controller.class_eval { helper_method :params_for, :main_path_to_return }
+        controller.class_eval { helper_method :params_for, :main_path_to_return, :render_parent?, :render_parent_options, :render_parent_action, :nested_singular_association?}
       end
 
       include ActiveScaffold::Helpers::IdHelpers
@@ -26,16 +26,63 @@ module ActiveScaffold
       # ActiveScaffold is used as a component on another controllers
       # page)
       def main_path_to_return
-        parameters = {}
-        if params[:parent_controller]
-          parameters[:controller] = params[:parent_controller]
-          parameters[:eid] = params[:parent_controller]
+        if params[:return_to]
+          params[:return_to]
+        else
+          parameters = {}
+          if params[:parent_controller]
+            parameters[:controller] = params[:parent_controller]
+            parameters[:eid] = params[:parent_controller]
+          end
+          if nested?
+            parameters[:controller] = nested.parent_scaffold.controller_path
+            parameters[:eid] = nil
+          end
+          if params[:parent_sti]
+            parameters[:controller] = params[:parent_sti]
+            parameters[:eid] = nil
+          end
+          parameters[:parent_column] = nil
+          parameters[:parent_id] = nil
+          parameters[:action] = "index"
+          parameters[:id] = nil
+          parameters[:associated_id] = nil
+          parameters[:utf8] = nil
+          params_for(parameters)
         end
-        parameters[:parent_column] = nil
-        parameters[:parent_id] = nil
-        parameters[:action] = "index"
-        parameters[:id] = nil
-        params_for(parameters)
+      end
+
+      def nested_singular_association?
+        nested? && (nested.belongs_to? || nested.has_one?)
+      end
+
+      def render_parent?
+        nested_singular_association? || params[:parent_sti]
+      end
+
+      def render_parent_options
+        if nested_singular_association?
+          {:controller => nested.parent_scaffold.controller_path, :action => :row, :id => nested.parent_id}
+        elsif params[:parent_sti]
+          options = {:controller => params[:parent_sti], :action => render_parent_action(params[:parent_sti])}
+          if render_parent_action(params[:parent_sti]) == :index
+            options.merge(params.slice(:eid))
+          else
+            options.merge({:id => @record.id})
+          end
+        end
+      end
+
+      def render_parent_action(controller_path = nil)
+        begin
+          @parent_action = :row
+          parent_controller = "#{controller_path.to_s.camelize}Controller".constantize
+          @parent_action = :index if action_name == 'create' && parent_controller.active_scaffold_config.actions.include?(:create) && parent_controller.active_scaffold_config.create.refresh_list == true
+          @parent_action = :index if action_name == 'update' && parent_controller.active_scaffold_config.actions.include?(:update) && parent_controller.active_scaffold_config.update.refresh_list == true
+          @parent_action = :index if action_name == 'destroy' && parent_controller.active_scaffold_config.actions.include?(:delete) && parent_controller.active_scaffold_config.delete.refresh_list == true
+        rescue ActiveScaffold::ControllerNotFound
+        end if @parent_action.nil?
+        @parent_action
       end
     end
   end

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -139,19 +139,23 @@ module ActiveScaffold
         [(text.is_a?(Symbol) ? column.active_record_class.human_attribute_name(text) : text), value]
       end
 
+      def active_scaffold_input_enum(column, html_options)
+        options = { :selected => @record.send(column.name) }
+        options_for_select = column.options[:options].collect do |text, value|
+          active_scaffold_translated_option(column, text, value)
+        end
+        html_options.update(column.options[:html_options] || {})
+        options.update(column.options)
+        select(:record, column.name, options_for_select, options, html_options)
+      end
+
       def active_scaffold_input_select(column, html_options)
         if column.singular_association?
           active_scaffold_input_singular_association(column, html_options)
         elsif column.plural_association?
           active_scaffold_input_plural_association(column, html_options)
         else
-          options = { :selected => @record.send(column.name) }
-          options_for_select = column.options[:options].collect do |text, value|
-            active_scaffold_translated_option(column, text, value)
-          end
-          html_options.update(column.options[:html_options] || {})
-          options.update(column.options)
-          select(:record, column.name, options_for_select, options, html_options)
+          active_scaffold_input_enum(column, html_options)
         end
       end
 
@@ -160,7 +164,7 @@ module ActiveScaffold
         column.options[:options].inject('') do |html, (text, value)|
           text, value = active_scaffold_translated_option(column, text, value)
           html << content_tag(:label, radio_button(:record, column.name, value, html_options.merge(:id => html_options[:id] + '-' + value.to_s)) + text)
-        end
+        end.html_safe
       end
 
       # requires RecordSelect plugin to be installed and configured.

data/lib/active_scaffold/helpers/id_helpers.rb

@@ -6,8 +6,8 @@ module ActiveScaffold
         controller.to_s.gsub("/", "__")
       end
 
-      def controller_id
-        controller_id ||= 'as_' + id_from_controller(params[:eid] || params[:parent_controller] || params[:controller])
+      def controller_id(controller = (params[:eid] || params[:parent_controller] || params[:controller]))
+        controller_id ||= 'as_' + id_from_controller(controller)
       end
 
       def active_scaffold_id
@@ -22,8 +22,8 @@ module ActiveScaffold
         "#{controller_id}-tbody"
       end
 
-      def active_scaffold_messages_id
-        "#{controller_id}-messages"
+      def active_scaffold_messages_id(options = {})
+        "#{options[:controller_id] || controller_id}-messages"
       end
 
       def active_scaffold_calculations_id(column = nil)
@@ -38,10 +38,6 @@ module ActiveScaffold
         "#{controller_id}-search-container"
       end
 
-      def search_form_id
-        "#{controller_id}-search-form"
-      end
-
       def search_input_id
         "#{controller_id}-search-input"
       end
@@ -63,7 +59,7 @@ module ActiveScaffold
         options[:action] ||= params[:action]
         options[:id] ||= params[:id]
         options[:id] ||= params[:parent_id]
-        clean_id "#{controller_id}-#{options[:action]}-#{options[:id]}-row"
+        clean_id "#{options[:controller_id] || controller_id}-#{options[:action]}-#{options[:id]}-row"
       end
 
       def element_cell_id(options = {})

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -43,23 +43,11 @@ module ActiveScaffold
             url_options[:link] = as_(:create_new) if link.crud_type == :create
           end
 
-          # check authorization
-          if column.association
-            associated_for_authorized = if associated.nil? || (associated.respond_to?(:empty?) && associated.empty?)
-              column.association.klass
-            elsif column.plural_association?
-              associated.first
-            else
-              associated
-            end
-            authorized = associated_for_authorized.authorized_for?(:crud_type => link.crud_type)
-            authorized = authorized and record.authorized_for?(:crud_type => :update, :column => column.name) if link.crud_type == :create
+          if column_link_authorized?(link, column, record, associated)
+            render_action_link(link, url_options, record)
           else
-            authorized = record.authorized_for?(:crud_type => link.crud_type)
+            "<a class='disabled'>#{text}</a>".html_safe
           end
-          # to make html render properly
-          return "<a class='disabled'>#{text}</a>".html_safe unless authorized
-          render_action_link(link, url_options, record)
         else
           text = active_scaffold_inplace_edit(record, column, {:formatted_column => text}) if inplace_edit?(record, column)
           text
@@ -70,36 +58,46 @@ module ActiveScaffold
       def action_link_to_inline_form(column, record, associated)
         link = column.link.clone
         if column.polymorphic_association?
-          polymorphic_controller = polymorphic_controller_for_nested_link(column, record)
+          polymorphic_controller = controller_path_for_activerecord(record.send(column.association.name).class)
           return link if polymorphic_controller.nil?
           link.controller = polymorphic_controller
         end
+        configure_column_link(link, associated, column.actions_for_association_links)
+      end
 
+      def configure_column_link(link, associated, actions)
         if column_empty?(associated) # if association is empty, we only can link to create form
-          if column.actions_for_association_links.include?(:new)
+          if actions.include?(:new)
             link.action = 'new'
             link.crud_type = :create
           end
-        elsif column.actions_for_association_links.include?(:edit)
+        elsif actions.include?(:edit)
           link.action = 'edit'
           link.crud_type = :update
-        elsif column.actions_for_association_links.include?(:show)
+        elsif actions.include?(:show)
           link.action = 'show'
           link.crud_type = :read
-        elsif column.actions_for_association_links.include?(:list)
-          link.parameters[:id] = record.send(column.association.name).id
+        elsif actions.include?(:list)
           link.action = 'index'
           link.crud_type = :read
         end
         link
       end
 
-      def polymorphic_controller_for_nested_link(column, record)
-        begin
-          controller = active_scaffold_controller_for(record.send(column.association.name).class)
-          controller.controller_path
-        rescue ActiveScaffold::ControllerNotFound
-          controller = nil
+      def column_link_authorized?(link, column, record, associated)
+        if column.association
+          associated_for_authorized = if associated.nil? || (associated.respond_to?(:empty?) && associated.empty?)
+            column.association.klass
+          elsif [:has_many, :has_and_belongs_to_many].include? column.association.macro
+            associated.first
+          else
+            associated
+          end
+          authorized = associated_for_authorized.authorized_for?(:crud_type => link.crud_type)
+          authorized = authorized and record.authorized_for?(:crud_type => :update, :column => column.name) if link.crud_type == :create
+          authorized
+        else
+          record.authorized_for?(:crud_type => link.crud_type)
         end
       end
 
@@ -347,7 +345,7 @@ module ActiveScaffold
 
       def render_nested_view(action_links, url_options, record)
         rendered = []
-        action_links.each do |link|
+        action_links.member.each do |link|
           if link.nested_link? && link.column && @nested_auto_open[link.column.name] && @records.length <= @nested_auto_open[link.column.name] && respond_to?(:render_component)
             link_url_options = {:adapter => '_list_inline_adapter', :format => :js}.merge(action_link_url_options(link, url_options, record, options = {:reuse_eid => true}))
             link_id = get_action_link_id(link_url_options, record, link.column)

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -123,8 +123,13 @@ module ActiveScaffold
 
       def active_scaffold_search_range(column, options)
         opt_value, from_value, to_value = field_search_params_range_values(column)
+
+        text_field_size = 10
         select_options = ActiveScaffold::Finder::NumericComparators.collect {|comp| [as_(comp.downcase.to_sym), comp]}
-        select_options.unshift *ActiveScaffold::Finder::StringComparators.collect {|title, comp| [as_(title), comp]} if column.column && column.column.text?
+        if column.column && column.column.text?
+          select_options.unshift *ActiveScaffold::Finder::StringComparators.collect {|title, comp| [as_(title), comp]}
+          text_field_size = 15
+        end
         from_value = controller.class.condition_value_for_numeric(column, from_value)
         to_value = controller.class.condition_value_for_numeric(column, to_value)
         from_value = format_number_value(from_value, column.options) if from_value.is_a?(Numeric)
@@ -133,9 +138,9 @@ module ActiveScaffold
               options_for_select(select_options, opt_value),
               :id => "#{options[:id]}_opt",
               :class => "as_search_range_option")
-        html << ' ' << text_field_tag("#{options[:name]}[from]", from_value, active_scaffold_input_text_options(:id => options[:id], :size => 10))
+        html << ' ' << text_field_tag("#{options[:name]}[from]", from_value, active_scaffold_input_text_options(:id => options[:id], :size => text_field_size))
         html << ' ' << content_tag(:span, (' - ' + text_field_tag("#{options[:name]}[to]", to_value,
-              active_scaffold_input_text_options(:id => "#{options[:id]}_to", :size => 10))).html_safe,
+              active_scaffold_input_text_options(:id => "#{options[:id]}_to", :size => text_field_size))).html_safe,
               :id => "#{options[:id]}_between", :class => "as_search_range_between", :style => "display:#{(opt_value == 'BETWEEN') ? '' : 'none'}")
         html
       end

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -34,6 +34,15 @@ module ActiveScaffold
       ## Uncategorized
       ##
 
+      def controller_path_for_activerecord(klass)
+        begin
+          controller = active_scaffold_controller_for(klass)
+          controller.controller_path
+        rescue ActiveScaffold::ControllerNotFound
+          controller = nil
+        end
+      end
+
       def generate_temporary_id
         (Time.now.to_f*1000).to_i.to_s
       end
@@ -128,6 +137,14 @@ module ActiveScaffold
         action_link_html(link, url_options, html_options)
       end
 
+      def render_group_action_link(link, url_options, options, record = nil)
+        if link.type == :member && !options[:authorized]
+          action_link_html(link, nil, {:class => "disabled #{link.action}#{link.html_options[:class].blank? ? '' : (' ' + link.html_options[:class])}"})
+        else
+          render_action_link(link, url_options, record)
+        end
+      end
+
       def action_link_url_options(link, url_options, record, options = {})
         url_options = url_options.clone
         url_options[:action] = link.action
@@ -135,7 +152,8 @@ module ActiveScaffold
         url_options.delete(:search) if link.controller and link.controller.to_s != params[:controller]
         url_options.merge! link.parameters if link.parameters
         url_options_for_nested_link(link.column, record, link, url_options, options) if link.nested_link?
-        url_options[:_method] = link.method if link.inline? && link.method != :get
+        url_options_for_sti_link(link.column, record, link, url_options, options) unless record.nil? || active_scaffold_config.sti_children.nil?
+        url_options[:_method] = link.method if !link.confirm? && link.inline? && link.method != :get
         url_options
       end
 
@@ -144,14 +162,17 @@ module ActiveScaffold
         html_options.reverse_merge! link.html_options.merge(:class => link.action)
 
         # Needs to be in html_options to as the adding _method to the url is no longer supported by Rails
-        html_options[:method] = link.method if !link.inline? && link.method != :get
+        html_options[:method] = link.method if link.method != :get
 
         html_options['data-confirm'] = link.confirm(record.try(:to_label)) if link.confirm?
         html_options['data-position'] = link.position if link.position and link.inline?
         html_options[:class] += ' as_action' if link.inline?
-        html_options[:popup] = true if link.popup?
+        if link.popup?
+          html_options['data-popup'] = true
+          html_options[:target] = '_blank'
+        end
         html_options[:id] = link_id
-        html_options[:remote] = true unless link.page?
+        html_options[:remote] = true unless link.page? || link.popup?
         if link.dhtml_confirm?
           html_options[:class] += ' as_action' if !link.inline?
           html_options[:page_link] = 'true' if !link.inline?
@@ -161,6 +182,7 @@ module ActiveScaffold
         html_options[:class] += " #{link.html_options[:class]}" unless link.html_options[:class].blank?
         html_options
       end
+
       def get_action_link_id(url_options, record = nil, column = nil)
         id = url_options[:id] || url_options[:parent_id]
         id = "#{column.association.name}-#{record.id}" if column && column.plural_association?
@@ -199,6 +221,16 @@ module ActiveScaffold
         end
       end
 
+      def url_options_for_sti_link(column, record, link, url_options, options = {})
+        #need to find out controller of current record type
+        #and set parameters
+        sti_controller_path = controller_path_for_activerecord(record.class)
+        if sti_controller_path
+          url_options[:controller] = sti_controller_path
+          url_options[:parent_sti] = controller_path
+        end
+      end
+
       def column_class(column, column_value, record)
         classes = []
         classes << "#{column.name}-column"
@@ -219,7 +251,7 @@ module ActiveScaffold
         classes = []
         classes << "#{column.name}-column_heading"
         classes << "sorted #{sorting.direction_of(column).downcase}" if sorting.sorts_on? column
-        classes << column.css_class unless column.css_class.nil?
+        classes << column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc)
         classes.join(' ')
       end
 
@@ -231,11 +263,15 @@ module ActiveScaffold
       end
 
       def column_calculation(column)
-        conditions = controller.send(:all_conditions)
-        includes = active_scaffold_config.list.count_includes
-        includes ||= controller.send(:active_scaffold_includes) unless conditions.nil?
-        calculation = beginning_of_chain.calculate(column.calculate, column.name, :conditions => conditions,
-         :joins => controller.send(:joins_for_collection), :include => includes)
+        unless column.calculate.instance_of? Proc
+          conditions = controller.send(:all_conditions)
+          includes = active_scaffold_config.list.count_includes
+          includes ||= controller.send(:active_scaffold_includes) unless conditions.nil?
+          calculation = beginning_of_chain.calculate(column.calculate, column.name, :conditions => conditions,
+           :joins => controller.send(:joins_for_collection), :include => includes)
+        else
+          column.calculate.call(@records)
+        end
       end
 
       def render_column_calculation(column)
@@ -243,7 +279,7 @@ module ActiveScaffold
         override_formatter = "render_#{column.name}_#{column.calculate}"
         calculation = send(override_formatter, calculation) if respond_to? override_formatter
 
-        "#{as_(column.calculate)}: #{format_column_value nil, column, calculation}"
+        "#{"#{as_(column.calculate)}: " unless column.calculate.is_a? Proc}#{format_column_value nil, column, calculation}"
       end
 
       def column_show_add_existing(column)
@@ -256,8 +292,9 @@ module ActiveScaffold
         value
       end
 
-      def error_messages_for(*params)
+      def active_scaffold_error_messages_for(*params)
         options = params.extract_options!.symbolize_keys
+        options.reverse_merge!(:container_tag => :div, :list_type => :ul)
 
         objects = Array.wrap(options.delete(:object) || params).map do |object|
           object = instance_variable_get("@#{object}") unless object.respond_to?(:to_model)
@@ -295,17 +332,21 @@ module ActiveScaffold
 
           error_messages = objects.sum do |object|
             object.errors.full_messages.map do |msg|
-              content_tag(:li, msg)
+              options[:list_type] != :br ? content_tag(:li, msg) : msg
             end
-          end.join.html_safe
+          end
+          error_messages = if options[:list_type] == :br
+            error_messages.join('<br/>').html_safe
+          else
+            content_tag(options[:list_type], error_messages.join.html_safe)
+          end
 
-          contents = ''
+          contents = []
           contents << content_tag(options[:header_tag] || :h2, header_message) unless header_message.blank?
           contents << content_tag(:p, message) unless message.blank?
-          contents << content_tag(:ul, error_messages)
-
-          content_tag(:div, contents.html_safe, html)
-
+          contents << error_messages
+          contents = contents.join.html_safe
+          options[:container_tag] ? content_tag(options[:container_tag], contents, html) : contents
         else
           ''
         end

data/lib/active_scaffold/locale/de.rb

@@ -7,13 +7,14 @@
       :are_you_sure_to_delete => 'Sind Sie sicher?',
       :cancel => 'Abbrechen',
       :click_to_edit => 'Zum Editieren anklicken',
+      :click_to_reset => 'Reset',
       :close => 'Schliessen',
       :config_list => 'Konfigurieren',
       :config_list_model => 'Konfiguriere Spalten für %{model}',
       :create => 'Anlegen',
       :create_model => 'Lege %{model} an',
       :create_another => 'Weitere anlegen',
-      :created_model => '%{model} anlegen',
+      :created_model => '%{model} angelegt',
       :create_new => 'Neu anlegen',
       :customize => 'Anpassen',
       :delete => 'Löschen',
@@ -60,6 +61,9 @@
       :'<' => '<',
       :'!=' => '!=',
       :between => 'Zwischen',
+      :contains => 'Enthält',
+      :begins_with => 'Beginnt',
+      :ends_with => 'Ended',
       :today => 'Heute',
       :yesterday => 'Gestern',
       :tomorrow => 'Morgen',
@@ -74,7 +78,7 @@
       :next_year => 'Nächstes Jahr',
       :past => 'Letzten', 
       :future => 'Nächsten',
-      :range => 'Spanne',
+      :range => 'Zeitraum',
       :seconds => 'Sekunden',
       :minutes => 'Minuten',
       :hours => 'Stunden',
@@ -83,8 +87,8 @@
       :months => 'Monate',
       :years => 'Jahre',
       :optional_attributes => 'Weitere',
-      :null => 'Undefiniert',
-      :not_null => 'Definiert',
+      :null => 'Null',
+      :not_null => 'Nicht Null',
       :date_picker_options => {
         :weekHeader => 'Wo',
 				:firstDay => 1,
@@ -92,7 +96,9 @@
 		    :showMonthAfterYear => false
       },
       :datetime_picker_options => {
-        :timeText => 'Uhrzeit'
+        :timeText => 'Uhrzeit',
+        :currentText => 'Jetzt',
+        :closeText => 'Schließen'
       },
       :errors => {
         :template => {
@@ -107,7 +113,8 @@
       :cant_destroy_record => "%{record} kann nicht gelöscht werden",
       :internal_error => 'Fehler bei der Verarbeitung (code 500, Interner Fehler)',
       :version_inconsistency => 'Inkonsistente Versionen - dieser Eintrag wurde verändert nachdem Sie mit der Bearbeitung begonnen haben.',
-      :record_not_saved => 'Eintrag kann nicht gespeichert werden. Ursache unbekannt.'
+      :record_not_saved => 'Eintrag kann nicht gespeichert werden. Ursache unbekannt.',
+      :no_authorization_for_action => "Keine Berechtigung für Aktion %{action}"
     }
   }
 }

data/lib/active_scaffold/locale/en.rb

@@ -112,7 +112,8 @@
       :cant_destroy_record => "%{record} can't be destroyed",
       :internal_error => 'Request Failed (code 500, Internal Error)',
       :version_inconsistency => 'Version inconsistency - this record has been modified since you started editing it.',
-      :record_not_saved => 'Failed to save record cause of an unknown error'
+      :record_not_saved => 'Failed to save record cause of an unknown error',
+      :no_authorization_for_action => "No Authorization for action %{action}"
     }
   }
 }

data/lib/active_scaffold/locale/es.yml

@@ -99,6 +99,8 @@ es:
       showMonthAfterYear: false
     datetime_picker_options:
       timeText: 'Hora'
+      currentText: 'Ahora'
+      closeText: 'Cerrar'
     errors:
       template:
         header:
@@ -110,3 +112,4 @@ es:
     cant_destroy_record: "No se pudo borrar %{record}"
     internal_error: 'Petición fallida (código 500, error interno)'
     version_inconsistency: 'Inconsistencia de versiones - este registro se ha modificado después de que empezó a editarlo.'
+    no_authorization_for_action: "No Authorization for action %{action}"

data/lib/active_scaffold/locale/fr.rb

@@ -92,7 +92,9 @@
 		    :showMonthAfterYear => false,
       },
       :datetime_picker_options => {
-        :timeText => 'Heure'
+        :timeText => 'Heure',
+        :currentText => 'Maintenant',
+        :closeText => 'Fermer'
       },
       :errors => {
         :template => {
@@ -107,7 +109,8 @@
       :cant_destroy_record => "%{record} can't be destroyed",
       :internal_error => 'Erreur de la requête (code 500, Erreur interne)',
       :version_inconsistency => "Version incomplète - Cet enregistrement a été modifié depuis que vous avez commencé à l'éditer.",
-      :record_not_saved => 'Failed to save record cause of an unknown error'
+      :record_not_saved => 'Failed to save record cause of an unknown error',
+      :no_authorization_for_action => "No Authorization for action %{action}"
     }
   }
 }