active_scaffold 3.1.9 → 3.1.10

data/lib/active_scaffold/actions/core.rb

@@ -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/bridges/date_picker/helper.rb

@@ -33,29 +33,25 @@ module ActiveScaffold::Bridges
       
       def self.date_options(locale)
         begin
-          date_options = I18n.translate! 'date', :locale => locale
           date_picker_options = { :closeText => as_(:close),
             :prevText => as_(:previous),
             :nextText => as_(:next),
             :currentText => as_(:today),
-            :monthNames => date_options[:month_names][1, (date_options[:month_names].length - 1)],
-            :monthNamesShort => date_options[:abbr_month_names][1, (date_options[:abbr_month_names].length - 1)],
-            :dayNames => date_options[:day_names],
-            :dayNamesShort => date_options[:abbr_day_names],
-            :dayNamesMin => date_options[:abbr_day_names],
+            :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,
           }
 
-          begin
-            as_date_picker_options = I18n.translate! 'active_scaffold.date_picker_options'
-            date_picker_options.merge!(as_date_picker_options) if as_date_picker_options.is_a? Hash
-          rescue
-            Rails.logger.warn "ActiveScaffold: Missing date picker localization for your locale: #{locale}"
-          end
+          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(date_options[:formats][:default])
-          date_picker_options[:dateFormat] = js_format unless js_format.nil?
+          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
@@ -76,19 +72,15 @@ module ActiveScaffold::Bridges
       def self.datetime_options(locale)
         begin
           rails_time_format = I18n.translate! 'time.formats.picker', :locale => locale
-          datetime_options = I18n.translate! 'datetime.prompts', :locale => locale
           datetime_picker_options = {:ampm => false,
-            :hourText => datetime_options[:hour],
-            :minuteText => datetime_options[:minute],
-            :secondText => datetime_options[:second],
+            :hourText => I18n.translate!('datetime.prompts.hour', :locale => locale),
+            :minuteText => I18n.translate!('datetime.prompts.minute', :locale => locale),
+            :secondText => I18n.translate!('datetime.prompts.second', :locale => locale)
           }
 
-          begin
-            as_datetime_picker_options = I18n.translate! 'active_scaffold.datetime_picker_options'
-            datetime_picker_options.merge!(as_datetime_picker_options) if as_datetime_picker_options.is_a? Hash
-          rescue
-            Rails.logger.warn "ActiveScaffold: Missing datetime picker localization for your locale: #{locale}"
-          end
+          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?

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 1
-    PATCH = 9
+    PATCH = 10
 
     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: 17
+  hash: 23
   prerelease: 
   segments: 
   - 3
   - 1
-  - 9
-  version: 3.1.9
+  - 10
+  version: 3.1.10
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-14 00:00:00 Z
+date: 2011-11-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -100,8 +100,8 @@ files:
 - app/assets/javascripts/active_scaffold.js.erb
 - app/assets/javascripts/jquery/active_scaffold.js
 - app/assets/javascripts/jquery/date_picker_bridge.js.erb
-- app/assets/javascripts/jquery/jquery.editinplace.js
 - app/assets/javascripts/jquery/draggable_lists.js
+- app/assets/javascripts/jquery/jquery.editinplace.js
 - app/assets/javascripts/jquery/active_scaffold.js~
 - app/assets/javascripts/jquery/draggable_lists.js~
 - app/assets/javascripts/prototype/active_scaffold.js
@@ -159,7 +159,7 @@ files:
 - frontends/default/views/add_existing_form.html.erb
 - frontends/default/views/create.html.erb
 - frontends/default/views/_human_conditions.html.erb
-- frontends/default/views/_horizontal_subform_footer.html.erb
+- frontends/default/views/_list_with_header.html.erb
 - frontends/default/views/field_search.html.erb
 - frontends/default/views/_render_field.js.erb
 - frontends/default/views/search.html.erb
@@ -168,10 +168,10 @@ files:
 - frontends/default/views/_list_pagination.html.erb
 - frontends/default/views/_list_record_columns.html.erb
 - frontends/default/views/show.html.erb
-- frontends/default/views/_list_with_header.html.erb
+- frontends/default/views/destroy.js.erb
 - frontends/default/views/_search_attribute.html.erb
 - frontends/default/views/action_confirmation.html.erb
-- frontends/default/views/destroy.js.erb
+- frontends/default/views/_horizontal_subform_footer.html.erb
 - frontends/default/views/edit_associated.js.erb
 - frontends/default/views/form_messages.js.erb
 - frontends/default/views/mark.js.rjs
@@ -181,8 +181,8 @@ files:
 - frontends/default/views/on_update.js.erb
 - frontends/default/views/render_field.js.erb
 - frontends/default/views/update_column.js.erb
-- frontends/default/views/update_row.js.erb
 - frontends/default/views/_base_form.html.erb~
+- frontends/default/views/update_row.js.erb
 - frontends/default/views/_form.html.erb~
 - frontends/default/views/_row.html.erb~
 - frontends/default/views/render_field.js.erb~
@@ -375,8 +375,8 @@ files:
 - vendor/assets/images/ui-icons_ef8c08_256x240.png
 - vendor/assets/images/ui-icons_ffd27a_256x240.png
 - vendor/assets/images/ui-icons_ffffff_256x240.png
-- vendor/assets/stylesheets/jquery-ui.css
 - vendor/assets/javascripts/jquery-ui-timepicker-addon.js
+- vendor/assets/stylesheets/jquery-ui.css
 - MIT-LICENSE
 - CHANGELOG
 - README