active_scaffold 3.2.4 → 3.2.5

data/CHANGELOG

@@ -1,3 +1,10 @@
+= 3.2.5
+- add outer window for pagination links
+- workaround rails 3.2.3 bug in TimeWithZone#to_time
+- fix date picker format for datetime fields
+- fix bitfields bridge when some actions are not used
+- use core config label when is set and STI is not used
+
 = 3.2.4
 - don't break on custom SQL sorting (e.g. sorting with functions)
 - fix cancel inplace edit with jquery

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

@@ -4,5 +4,5 @@
                                                 :form_action => form_action,
                                                 :method => method ||= :post,
                                                 :cancel_link => cancel_link,
-                                                :headline => headline ||= active_scaffold_config.send(form_action).label(active_scaffold_config.sti_create_links ? @record.class.model_name.human(:count => 1) : nil)} %>
+                                                :headline => headline ||= active_scaffold_config.send(form_action).label(active_scaffold_config.add_sti_create_links? ? @record.class.model_name.human(:count => 1) : nil)} %>
 

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

@@ -3,4 +3,4 @@
                                                 :form_action => form_action ||= :create,
                                                 :method => method ||= :post,
                                                 :cancel_link => cancel_link,
-                                                :headline => headline ||= active_scaffold_config.create.label(active_scaffold_config.sti_create_links ? @record.class.model_name.human(:count => 1) : nil)} %>
+                                                :headline => headline ||= active_scaffold_config.create.label(active_scaffold_config.add_sti_create_links? ? @record.class.model_name.human(:count => 1) : nil)} %>

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

@@ -4,6 +4,6 @@
 
   <%= loading_indicator_tag :action => :pagination %>
   <%= link_to as_(:previous), url_options.merge(:page => current_page.number - 1), options.merge(:class => "as_paginate previous") if current_page.prev? %>
-  <%= pagination_ajax_links current_page, url_options, options, active_scaffold_config.list.page_links_window %>
+  <%= pagination_ajax_links current_page, url_options, options, active_scaffold_config.list.page_links_inner_window, active_scaffold_config.list.page_links_outer_window %>
   <%= link_to as_(:next), url_options.merge(:page => current_page.number + 1), options.merge(:class => "as_paginate next") if current_page.next? %>
 <% end -%>

data/lib/active_scaffold/bridges/bitfields/bitfields_bridge.rb

@@ -19,7 +19,7 @@ module ActiveScaffold
           self.model.bitfields.each do |column_name, options|
             columns = options.keys.sort_by { |column| self.columns[column].weight }
             [:create, :update, :show, :subform].each do |action|
-              self.send(action).columns.add_subgroup(column_name) { |group| group.add *columns }
+              self.send(action).columns.add_subgroup(column_name) { |group| group.add *columns } if self.actions.included? action
             end
           end if self.model.respond_to?(:bitfields) and self.model.bitfields.present?
           

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

@@ -16,7 +16,7 @@ ActiveScaffold::Config::Core.class_eval do
     # check to see if file column was used on the model
     return if date_picker_fields.empty?
     
-    # automatically set the forum_ui to a file column
+    # automatically set the forum_ui to a date_picker or datetime_picker
     date_picker_fields.each{|field|
       col_config = self.columns[field[:name]] 
       col_config.form_ui = (field[:type] == :date ? :date_picker : :datetime_picker)

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

@@ -158,7 +158,7 @@ module ActiveScaffold::Bridges
           options = active_scaffold_input_text_options(options.merge(column.options))
           options[:class] << " #{column.search_ui.to_s}"
           options[:style] = (options[:show].nil? || options[:show]) ? nil : "display: none"
-          format = options.delete(:format) || :default
+          format = options.delete(:format) || column.form_ui == :date_picker ? :default : :picker
           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
@@ -169,7 +169,7 @@ module ActiveScaffold::Bridges
           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
+          format = options.delete(:format) || column.form_ui == :date_picker ? :default : :picker
           datepicker_format_options(column, format, options)
           options[:value] = (value ? l(value, :format => format) : nil)
           text_field(:record, column.name, options)

data/lib/active_scaffold/config/list.rb

@@ -7,7 +7,8 @@ module ActiveScaffold::Config
       # inherit from global scope
       # full configuration path is: defaults => global table => local table
       @per_page = self.class.per_page
-      @page_links_window = self.class.page_links_window
+      @page_links_inner_window = self.class.page_links_inner_window
+      @page_links_outer_window = self.class.page_links_outer_window
       
       # originates here
       @sorting = ActiveScaffold::DataStructures::Sorting.new(@core.columns)
@@ -28,8 +29,19 @@ module ActiveScaffold::Config
     @@per_page = 15
 
     # how many page links around current page to show
-    cattr_accessor :page_links_window
-    @@page_links_window = 2
+    cattr_accessor :page_links_inner_window
+    @@page_links_inner_window = 2
+
+    # how many page links around first and last page to show
+    cattr_accessor :page_links_outer_window
+    @@page_links_outer_window = 0
+    
+    class << self
+      def page_links_window=(value)
+        ActiveSupport::Deprecation.warn("Use page_links_inner_window", caller(1))
+        self.page_links_inner_window = value
+      end
+    end
 
     # what string to use when a field is empty
     cattr_accessor :empty_field_text
@@ -64,7 +76,15 @@ module ActiveScaffold::Config
     attr_accessor :per_page
 
     # how many page links around current page to show
-    attr_accessor :page_links_window
+    attr_accessor :page_links_inner_window
+
+    # how many page links around current page to show
+    attr_accessor :page_links_outer_window
+    
+    def page_links_window=(value)
+      ActiveSupport::Deprecation.warn("Use page_links_inner_window", caller(1))
+      self.page_links_inner_window = value
+    end
 
     # What kind of pagination to use:
     # * true: The usual pagination

data/lib/active_scaffold/finder.rb

@@ -110,7 +110,13 @@ module ActiveScaffold
         if value.is_a? Hash
           Time.zone.local(*[:year, :month, :day, :hour, :minute, :second].collect {|part| value[part].to_i}) rescue nil
         elsif value.respond_to?(:strftime)
-          value.send(conversion)
+          if conversion == :to_time
+            # Explicitly get the current zone, because TimeWithZone#to_time in rails 3.2.3 returns UTC.
+            # https://github.com/rails/rails/pull/2453
+            value.to_time.in_time_zone
+          else
+            value.send(conversion)
+          end
         elsif conversion == :to_date
           Date.strptime(value, I18n.t('date.formats.default')) rescue nil
         else

data/lib/active_scaffold/helpers/pagination_helpers.rb

@@ -5,9 +5,9 @@ module ActiveScaffold
         link_to page_number, url_options.merge(:page => page_number), options.merge(:class => "as_paginate")
       end
 
-      def pagination_ajax_links(current_page, url_options, options, window_size)
-        start_number = current_page.number - window_size
-        end_number = current_page.number + window_size
+      def pagination_ajax_links(current_page, url_options, options, inner_window, outer_window)
+        start_number = current_page.number - inner_window
+        end_number = current_page.number + inner_window
         start_number = 1 if start_number <= 0
         if current_page.pager.infinite?
           offsets = [20, 100]
@@ -16,23 +16,24 @@ module ActiveScaffold
         end
 
         html = []
-        unless start_number == 1
-          last_page = 1
-          html << pagination_ajax_link(last_page, url_options, options)
-          if current_page.pager.infinite?
-            offsets.reverse.each do |offset|
-              page = current_page.number - offset
-              if page < start_number && page > 1
-                html << '..' if page > last_page + 1
-                html << pagination_ajax_link(page, params)
-                last_page = page
-              end
+        last_page = 1
+        last_page.upto(last_page + outer_window) do |num|
+          html << pagination_ajax_link(num, url_options, options)
+          last_page = num
+        end
+        if current_page.pager.infinite?
+          offsets.reverse.each do |offset|
+            page = current_page.number - offset
+            if page < start_number && page > last_page
+              html << '..' if page > last_page + 1
+              html << pagination_ajax_link(page, params)
+              last_page = page
             end
           end
-          html << ".." if start_number > last_page + 1
         end
+        html << ".." if start_number > last_page + 1
 
-        start_number.upto(end_number) do |num|
+        [start_number, last_page + 1].max.upto(end_number) do |num|
           if current_page.number == num
             html << content_tag(:span, num.to_s, {:class => "as_paginate current"})
           else
@@ -45,8 +46,10 @@ module ActiveScaffold
             html << '..' << pagination_ajax_link(current_page.number + offset, url_options, options)
           end
         else
-          html << ".." unless end_number >= current_page.pager.last.number - 1
-          html << pagination_ajax_link(current_page.pager.last.number, url_options, options) unless end_number == current_page.pager.last.number
+          html << ".." unless end_number >= current_page.pager.last.number - outer_window - 1
+          [end_number + 1, current_page.pager.last.number - outer_window].max.upto(current_page.pager.last.number) do |num|
+            html << pagination_ajax_link(num, url_options, options)
+          end
         end
         html.join(' ').html_safe
       end

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 2
-    PATCH = 4
+    PATCH = 5
 
     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: 7
+  hash: 5
   prerelease: 
   segments: 
   - 3
   - 2
-  - 4
-  version: 3.2.4
+  - 5
+  version: 3.2.5
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-16 00:00:00 Z
+date: 2012-05-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   prerelease: false
+  type: :development
   requirement: *id001
   name: shoulda
 - !ruby/object:Gem::Dependency 
@@ -43,8 +43,8 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :development
   prerelease: false
+  type: :development
   requirement: *id002
   name: bundler
 - !ruby/object:Gem::Dependency 
@@ -57,8 +57,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   prerelease: false
+  type: :development
   requirement: *id003
   name: rcov
 - !ruby/object:Gem::Dependency 
@@ -73,8 +73,8 @@ dependencies:
         - 1
         - 3
         version: 3.1.3
-  type: :runtime
   prerelease: false
+  type: :runtime
   requirement: *id004
   name: rails
 description: Save time and headaches, and create a more easily maintainable set of pages, with ActiveScaffold. ActiveScaffold handles all your CRUD (create, read, update, delete) user interface needs, leaving you more time to focus on more challenging (and interesting!) problems.
@@ -437,7 +437,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Rails 3.1 Version of activescaffold supporting prototype and jquery