active_scaffold 3.1.15 → 3.1.17

data/config/locales/es.yml

@@ -60,12 +60,12 @@ es:
     update: 'Actualizar'
     update_model: 'Actualizar %{model}'
     updated_model: '%{model} actualizado'
-    '=': '='
-    '>=': '>='
-    '<=': '<='
-    '>': '>'
-    '<': '<'
-    '!=': '!='
+    '=': 'Igual'
+    '>=': 'Mayor o igual'
+    '<=': 'Menor o igual'
+    '>': 'Mayor'
+    '<': 'Menor'
+    '!=': 'Distinto'
     between: 'Entre'
     is_null: 'Es nulo'
     is_not_null: 'No es nulo'

data/config/locales/es.yml~

@@ -0,0 +1,120 @@
+es:
+  time:
+    formats:
+      picker: "%a, %d %b %Y %H:%M:%S"
+  active_scaffold:
+    add: 'Añadir'
+    add_existing: 'Añadir Existente'
+    add_existing_model: 'Añadir %{model} Existente'
+    are_you_sure_to_delete: '¿Estás seguro de que quieres borrar %{label}?'
+    cancel: 'Cancelar'
+    click_to_edit: 'Pulsa para editar'
+    click_to_reset: 'Pulsa para restaurar'
+    close: 'Cerrar'
+    config_list: 'Configurar'
+    config_list_model: 'Configurar columnas de %{model}'
+    create: 'Crear'
+    create_model: 'Crear %{model}'
+    create_another: 'Crear Otro %{model}'
+    created_model: '%{model} creado'
+    create_new: 'Crear Nuevo'
+    customize: 'Personalizar'
+    delete: 'Borrar'
+    deleted_model: '%{model} borrado'
+    delimiter: 'Delimitador'
+    download: 'Descargar'
+    edit: 'Editar'
+    export: 'Exportar'
+    'false': 'No'
+    filtered: '(Filtrado)'
+    found:
+      one: 'encontrado'
+      other: 'encontrados'
+    hide: 'Ocultar'
+    live_search: 'Buscar en Vivo'
+    loading: 'Cargando…'
+    nested_for_model: '%{nested_model} de %{parent_model}'
+    nested_of_model: '%{nested_model} de %{parent_model}'
+    next: 'Siguiente'
+    no_entries: 'Sin entradas'
+    no_options: 'sin opciones'
+    omit_header: 'Omitir Cabecera'
+    options: 'Opciones'
+    pdf: 'PDF'
+    previous: 'Anterior'
+    print: 'Imprimir'
+    refresh: 'Recargar'
+    remove: 'Eliminar'
+    remove_file: 'Eliminar o Reemplazar archivo'
+    replace_with_new: 'Reemplazar con Nuevo'
+    revisions_for_model: 'Revisiones de %{model}'
+    reset: 'Restaurar'
+    saving: 'Guardando…'
+    search: 'Buscar'
+    search_terms: 'Términos a buscar'
+    _select_: '- seleccionar -'
+    show: 'Ver'
+    show_model: 'Ver %{model}'
+    _to_ : ' a '
+    'true': 'Sí'
+    update: 'Actualizar'
+    update_model: 'Actualizar %{model}'
+    updated_model: '%{model} actualizado'
+    '=': 'Igual a'
+    '>=': 'Mayor o igual a'
+    '<=': 'Menor o igual a'
+    '>': 'Mayor a'
+    '<': 'Menor a'
+    '!=': 'Distinto de'
+    between: 'Entre'
+    is_null: 'Es nulo'
+    is_not_null: 'No es nulo'
+    contains: 'Contiene'
+    begins_with: 'Empieza con'
+    ends_with: 'Termina con'
+    today: 'Hoy'
+    yesterday: 'Ayer'
+    tomorrow: 'Mañana'
+    this_week: 'Esta semana'
+    prev_week: 'Semana pasada'
+    next_week: 'Próxima semana'
+    this_month: 'Este mes'
+    prev_month: 'Mes pasado'
+    next_month: 'Próximo mes'
+    this_year: 'Este año'
+    prev_year: 'Año pasado'
+    next_year: 'Próximo año'
+    past: 'Pasado'
+    future: 'Futuro'
+    range: 'Rango'
+    seconds: 'Segundos'
+    minutes: 'Minutos'
+    hours: 'Horas'
+    days: 'Días'
+    weeks: 'Semanas'
+    months: 'Meses'
+    years: 'Años'
+    optional_attributes: 'Más opciones'
+    null: 'Nulo'
+    not_null: 'No Nulo'
+    date_picker_options:
+      weekHeader: 'Sm'
+      firstDay: 1
+      isRTL: false
+      showMonthAfterYear: false
+    datetime_picker_options:
+      timeText: 'Hora'
+      currentText: 'Ahora'
+      closeText: 'Cerrar'
+    errors:
+      template:
+        header:
+          one: "No se pudo guardar debido a un error."
+          other: "No se pudo guardar debido a %{count} errores."
+        body: "Hubo problemas con los siguientes campos:"
+
+    # error_messages
+    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 dispone de autorización para la acción %{action}"

data/lib/active_scaffold/actions/nested.rb

@@ -25,13 +25,12 @@ module ActiveScaffold::Actions
     end
     
     def set_nested
-      if params[:parent_scaffold] && ((params[:association] && params[:assoc_id]) || params[:named_scope])
+      if params[:parent_scaffold] && (params[:association] || params[:named_scope])
         @nested = ActiveScaffold::DataStructures::NestedInfo.get(active_scaffold_config.model, params)
         unless @nested.nil?
-          register_constraints_with_action_columns(@nested.constrained_fields,  active_scaffold_config.list.hide_nested_column ? [] : [:list])
           active_scaffold_constraints[:id] = params[:id] if @nested.belongs_to?
+          register_constraints_with_action_columns(@nested.constrained_fields,  active_scaffold_config.list.hide_nested_column ? [] : [:list])
         end
-        #params.delete_if {|key, value| [:parent_scaffold, :association, :named_scope, :assoc_id].include? key.to_sym}
       end
     end
     

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

@@ -25,15 +25,11 @@ module ActiveScaffold::Actions
     end
     
     def set_nested
-      if params[:parent_scaffold] && ((params[:association] && params[:assoc_id]) || params[:named_scope])
-        nested_info = {:parent_scaffold => params[:parent_scaffold].to_s,
-                       :association => params[:association],
-                       :named_scope => params[:named_scope],
-                       :parent_id => params[:assoc_id]}
-        @nested = ActiveScaffold::DataStructures::NestedInfo.get(active_scaffold_config.model, nested_info)
+      if params[:parent_scaffold] && (params[:association] || params[:named_scope])
+        @nested = ActiveScaffold::DataStructures::NestedInfo.get(active_scaffold_config.model, params)
         unless @nested.nil?
-          register_constraints_with_action_columns(@nested.constrained_fields,  active_scaffold_config.list.hide_nested_column ? [] : [:list])
           active_scaffold_constraints[:id] = params[:id] if @nested.belongs_to?
+          register_constraints_with_action_columns(@nested.constrained_fields,  active_scaffold_config.list.hide_nested_column ? [] : [:list])
         end
         #params.delete_if {|key, value| [:parent_scaffold, :association, :named_scope, :assoc_id].include? key.to_sym}
       end

data/lib/active_scaffold/bridges/date_picker/helper.rb

@@ -150,7 +150,7 @@ module ActiveScaffold::Bridges
       module SearchColumnHelpers
         def active_scaffold_search_date_bridge_calendar_control(column, options, current_search, name)
           if current_search.is_a? Hash
-            value = controller.class.condition_value_for_datetime(current_search[name], column.form_ui == :date_picker ? :to_date : :to_time)
+            value = controller.class.condition_value_for_datetime(current_search[name], column.search_ui == :date_picker ? :to_date : :to_time)
           else
             value = current_search
           end

data/lib/active_scaffold/bridges/date_picker/helper.rb~

@@ -0,0 +1,180 @@
+module ActiveScaffold::Bridges
+  class DatePicker
+    module Helper
+      DATE_FORMAT_CONVERSION = {
+        /%a/ => 'D',
+        /%A/ => 'DD',
+        /%b/ => 'M',
+        /%B/ => 'MM',
+        /%d/ => 'dd',
+        /%e/ => 'd',
+        /%j/ => 'oo',
+        /%m/ => 'mm',
+        /%y/ => 'y',
+        /%Y/ => 'yy',
+        /%H/ => 'hh', # options ampm => false
+        /%I/ => 'hh', # options ampm => true
+        /%M/ => 'mm',
+        /%p/ => 'tt',
+        /%S/ => 'ss',
+        /%[cUWwxXZz]/ => ''
+      }
+      
+      def self.date_options_for_locales
+        I18n.available_locales.collect do |locale|
+          locale_date_options = date_options(locale)
+          if locale_date_options
+            "$.datepicker.regional['#{locale}'] = #{locale_date_options.to_json};"
+          else
+            nil
+          end
+        end.compact.join('')
+      end
+      
+      def self.date_options(locale)
+        begin
+          date_picker_options = { :closeText => as_(:close),
+            :prevText => as_(:previous),
+            :nextText => as_(:next),
+            :currentText => as_(:today),
+            :monthNames => I18n.translate!('date.month_names', :locale => locale)[1..-1],
+            :monthNamesShort => I18n.translate!('date.abbr_month_names', :locale => locale)[1..-1],
+            :dayNames => I18n.translate!('date.day_names', :locale => locale),
+            :dayNamesShort => I18n.translate!('date.abbr_day_names', :locale => locale),
+            :dayNamesMin => I18n.translate!('date.abbr_day_names', :locale => locale),
+            :changeYear => true,
+            :changeMonth => true,
+          }
+
+          as_date_picker_options = I18n.translate! :date_picker_options, :scope => :active_scaffold, :locale => locale, :default => ''
+          date_picker_options.merge!(as_date_picker_options) if as_date_picker_options.is_a? Hash
+          Rails.logger.warn "ActiveScaffold: Missing date picker localization for your locale: #{locale}" if as_date_picker_options.blank?
+
+          js_format = self.to_datepicker_format(I18n.translate!('date.formats.default', :locale => locale, :default => ''))
+          date_picker_options[:dateFormat] = js_format unless js_format.blank?
+          date_picker_options
+        rescue
+          raise if locale == I18n.locale
+        end
+      end
+
+      def self.datetime_options_for_locales
+        I18n.available_locales.collect do |locale|
+          locale_datetime_options = datetime_options(locale)
+          if locale_datetime_options
+            "$.timepicker.regional['#{locale}'] = #{locale_datetime_options.to_json};"
+          else
+            nil
+          end
+        end.compact.join('')
+      end
+      
+      def self.datetime_options(locale)
+        begin
+          rails_time_format = I18n.translate! 'time.formats.picker', :locale => locale
+          datetime_picker_options = {:ampm => false,
+            :hourText => I18n.translate!('datetime.prompts.hour', :locale => locale),
+            :minuteText => I18n.translate!('datetime.prompts.minute', :locale => locale),
+            :secondText => I18n.translate!('datetime.prompts.second', :locale => locale)
+          }
+
+          as_datetime_picker_options = I18n.translate! :datetime_picker_options, :scope => :active_scaffold, :locale => locale, :default => ''
+          datetime_picker_options.merge!(as_datetime_picker_options) if as_datetime_picker_options.is_a? Hash
+          Rails.logger.warn "ActiveScaffold: Missing datetime picker localization for your locale: #{locale}" if as_datetime_picker_options.blank?
+
+          date_format, time_format = self.split_datetime_format(self.to_datepicker_format(rails_time_format))
+          datetime_picker_options[:dateFormat] = date_format unless date_format.nil?
+          unless time_format.nil?
+            datetime_picker_options[:timeFormat] = time_format
+            datetime_picker_options[:ampm] = true if rails_time_format.include?('%I')
+          end
+          datetime_picker_options
+        rescue
+          raise if locale == I18n.locale
+        end
+      end
+      
+      def self.to_datepicker_format(rails_format)
+        return nil if rails_format.nil?
+        if rails_format =~ /%[cUWwxXZz]/
+          Rails.logger.warn("AS DatePicker::Helper: rails date format #{rails_format} includes options which can't be converted to jquery datepicker format. Options %c, %U, %W, %w, %x %X, %z, %Z are not supported by datepicker and will be removed")
+          nil
+        end
+        js_format = rails_format.dup
+        DATE_FORMAT_CONVERSION.each do |key, value|
+          js_format.gsub!(key, value)
+        end
+        js_format
+      end
+      
+      def self.split_datetime_format(datetime_format)
+        date_format = datetime_format
+        time_format = nil
+        time_start_indicators = %w{hh mm tt ss}
+        unless datetime_format.nil?
+          start_indicator = time_start_indicators.detect {|indicator| datetime_format.include?(indicator)}
+          unless start_indicator.nil?
+            pos_time_format = datetime_format.index(start_indicator)
+            date_format = datetime_format.to(pos_time_format - 1)
+            time_format = datetime_format.from(pos_time_format)
+          end
+        end
+        return date_format, time_format
+      end
+      
+      module DatepickerColumnHelpers
+        def datepicker_split_datetime_format(datetime_format)
+          ActiveScaffold::Bridges::DatePicker::Helper.split_datetime_format(datetime_format)
+        end
+        
+        def to_datepicker_format(rails_format)
+          ActiveScaffold::Bridges::DatePicker::Helper.to_datepicker_format(rails_format)
+        end
+        
+        def datepicker_format_options(column, format, options)
+          if column.form_ui == :date_picker
+            js_format = to_datepicker_format(I18n.translate!("date.formats.#{format}"))
+            options['date:dateFormat'] = js_format unless js_format.nil?
+          else
+            rails_time_format = I18n.translate!("time.formats.#{format}")
+            date_format, time_format = datepicker_split_datetime_format(self.to_datepicker_format(rails_time_format))
+            options['date:dateFormat'] = date_format unless date_format.nil?
+            unless time_format.nil?
+              options['time:timeFormat'] = time_format
+              options['time:ampm'] = true if rails_time_format.include?('%I')
+            end
+          end unless format == :default
+        end
+      end
+      
+      module SearchColumnHelpers
+        def active_scaffold_search_date_bridge_calendar_control(column, options, current_search, name)
+          if current_search.is_a? Hash
+            value = controller.class.condition_value_for_datetime(current_search[name], column.form_ui == :date_picker ? :to_date : :to_time)
+          else
+            value = current_search
+          end
+          options = column.options.merge(options).except!(:include_blank, :discard_time, :discard_date, :value)
+          options = active_scaffold_input_text_options(options.merge(column.options))
+          options[:class] << " #{column.search_ui.to_s}"
+          options[:style] = "display:#{(options[:show].nil? || options[:show]) ? '' : 'none'}"
+          format = options.delete(:format) || :default
+          datepicker_format_options(column, format, options)
+          text_field_tag("#{options[:name]}[#{name}]", value ? l(value, :format => format) : nil, options.merge(:id => "#{options[:id]}_#{name}", :name => "#{options[:name]}[#{name}]"))
+        end
+      end
+      
+      module FormColumnHelpers
+        def active_scaffold_input_date_picker(column, options)
+          options = active_scaffold_input_text_options(options.merge(column.options))
+          options[:class] << " #{column.form_ui.to_s}"
+          value = controller.class.condition_value_for_datetime(@record.send(column.name), column.form_ui == :date_picker ? :to_date : :to_time)
+          format = options.delete(:format) || :default
+          datepicker_format_options(column, format, options)
+          options[:value] = (value ? l(value, :format => format) : nil)
+          text_field(:record, column.name, options)
+        end
+      end
+    end
+  end
+end

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -7,10 +7,12 @@ module ActiveScaffold::DataStructures
         nested_info[:parent_scaffold] = "#{params[:parent_scaffold].to_s.camelize}Controller".constantize
         nested_info[:parent_model] = nested_info[:parent_scaffold].active_scaffold_config.model
         nested_info[:parent_id] = params[nested_info[:parent_model].name.foreign_key]
-        unless nested_info[:association].nil?
-          ActiveScaffold::DataStructures::NestedInfoAssociation.new(model, nested_info)
-        else
-          ActiveScaffold::DataStructures::NestedInfoScope.new(model, nested_info)
+        if nested_info[:parent_id]
+          unless params[:association].nil?
+            ActiveScaffold::DataStructures::NestedInfoAssociation.new(model, nested_info)
+          else
+            ActiveScaffold::DataStructures::NestedInfoScope.new(model, nested_info)
+          end
         end
       rescue ActiveScaffold::ControllerNotFound
         nil
@@ -106,7 +108,7 @@ module ActiveScaffold::DataStructures
     protected
     
     def iterate_model_associations(model)
-      @constrained_fields = [] 
+      @constrained_fields = []
       @constrained_fields << association.foreign_key.to_sym unless association.belongs_to?
       model.reflect_on_all_associations.each do |current|
         if !current.belongs_to? && association.foreign_key == current.association_foreign_key

data/lib/active_scaffold/data_structures/nested_info.rb~

@@ -6,12 +6,13 @@ module ActiveScaffold::DataStructures
         nested_info[:name] = (params[:association] || params[:named_scope]).to_sym
         nested_info[:parent_scaffold] = "#{params[:parent_scaffold].to_s.camelize}Controller".constantize
         nested_info[:parent_model] = nested_info[:parent_scaffold].active_scaffold_config.model
-        unless nested_info[:association].nil?
-          nested_info[:parent_id] = params[nested_info[:parent_model].name.foreign_key]
-          ActiveScaffold::DataStructures::NestedInfoAssociation.new(model, nested_info)
-        else
-          nested_info[:parent_id] = params[:assoc_id]
-          ActiveScaffold::DataStructures::NestedInfoScope.new(model, nested_info)
+        nested_info[:parent_id] = params[nested_info[:parent_model].name.foreign_key]
+        if nested_info[:parent_id]
+          unless params[:association].nil?
+            ActiveScaffold::DataStructures::NestedInfoAssociation.new(model, nested_info)
+          else
+            ActiveScaffold::DataStructures::NestedInfoScope.new(model, nested_info)
+          end
         end
       rescue ActiveScaffold::ControllerNotFound
         nil
@@ -107,7 +108,8 @@ module ActiveScaffold::DataStructures
     protected
     
     def iterate_model_associations(model)
-      @constrained_fields = [] 
+      @constrained_fields = []
+          debugger
       @constrained_fields << association.foreign_key.to_sym unless association.belongs_to?
       model.reflect_on_all_associations.each do |current|
         if !current.belongs_to? && association.foreign_key == current.association_foreign_key

data/lib/active_scaffold/extensions/action_view_rendering.rb

@@ -74,8 +74,11 @@ module ActionView::Helpers #:nodoc:
         else
           content_tag(:div, :id => id, :class => 'active-scaffold-component') do
             url = url_for(url_options)
+            # parse the ActiveRecord model name from the controller path, which
+            # might be a namespaced controller (e.g., 'admin/admins')
+            model = remote_controller.to_s.sub(/.*\//, '').singularize
             content_tag(:div, :class => 'active-scaffold-header') do
-              content_tag :h2, link_to(args.first[:label] || active_scaffold_config_for(remote_controller.to_s.singularize).list.label, url, :remote => true)
+              content_tag :h2, link_to(args.first[:label] || active_scaffold_config_for(model).list.label, url, :remote => true)
             end <<
             if ActiveScaffold.js_framework == :prototype
               javascript_tag("new Ajax.Updater('#{id}', '#{url}', {method: 'get', evalScripts: true});")

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 1
-    PATCH = 15
+    PATCH = 17
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 33
   prerelease: 
   segments: 
   - 3
   - 1
-  - 15
-  version: 3.1.15
+  - 17
+  version: 3.1.17
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-18 00:00:00 Z
+date: 2012-01-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -122,6 +122,7 @@ files:
 - config/locales/hu.yml
 - config/locales/ja.yml
 - config/locales/ru.yml
+- config/locales/es.yml~
 - frontends/default/views/_add_existing_form.html.erb
 - frontends/default/views/_create_form.html.erb
 - frontends/default/views/_create_form_on_list.html.erb
@@ -303,6 +304,7 @@ files:
 - lib/active_scaffold/bridges/date_picker.rb
 - lib/active_scaffold/bridges/date_picker/ext.rb
 - lib/active_scaffold/bridges/date_picker/helper.rb
+- lib/active_scaffold/bridges/date_picker/helper.rb~
 - lib/active_scaffold/bridges/dragonfly.rb
 - lib/active_scaffold/bridges/dragonfly/dragonfly_bridge.rb
 - lib/active_scaffold/bridges/dragonfly/dragonfly_bridge_helpers.rb