@@ -7,7 +7,6 @@ class Symbol def date_select(*args) Thread.current[:view_template].date_select(self, *args) end - # See Mack::ViewHelpers::FormHelpers check_box for more information # lib/mack/core_extensions/symbol.rb @@ -21,7 +21,8 @@ module Mack var = instance_variable_get("@#{name}") fe = FormElement.new(*args) - time = var.nil? ? Time.now : (var.send(fe.calling_method) || Time.now) + time = var if var.is_a?(Time) || var.is_a?(Date) + time = var.nil? ? Time.now : (var.send(fe.calling_method) || Time.now) if time.nil? years = [] (time.year - 5).upto(time.year + 5) { |y| years << [y, y]} @@ -59,6 +60,9 @@ module Mack return label + boxes end + # Used just like date_time_select, but it has hours, minutes, and seconds turned off. + # + # def date_select(name, *args) fe = FormElement.new(*args) date_time_select(name, fe.calling_method, {:hours => false, :minutes => false, :seconds => false}.merge(fe.options)) @@ -69,6 +73,8 @@ module Mack options = {:name => name, :id => name} unless fe.calling_method == :to_s options.merge!(:name => "#{name}[#{fe.calling_method}(#{col})]", :id => "#{name}_#{fe.calling_method}_#{col}") + else + options.merge!(:name => "#{name}(#{col})", :id => "#{name}_#{col}") end options.merge!(:options => values, :selected => selected) select_tag(name, fe.options.merge(options)) lib/mack/view_helpers/date_time_helpers.rb @@ -44,6 +44,13 @@ describe Mack::ViewHelpers::FormHelpers do describe "date_time_select" do + it "should work on a non-model time" do + @created_at = Time.now + dts = date_time_select(:created_at) + dts.should match(/created_at\(year\)/) + dts.should match(/<option value="#{@created_at.year}" selected>#{@created_at.year}<\/option>/) + end + it "should generate 5 select tags by default" do @dilbert = Dilbert.new @dilbert.created_at = Time.parse("2008-8-16 19:35") @@ -96,6 +103,16 @@ describe Mack::ViewHelpers::FormHelpers do date_select(:dilbert, :created_at).should == date_time_select(:dilbert, :created_at, :months => true, :days => true, :hours => false, :minutes => false) end + it "should work on a non-model time" do + dts = date_select(:expected_date) + dts.should match(/expected_date\(year\)/) + dts.should match(/<option value="2008" selected>2008<\/option>/) + dts.should match(/expected_date\(month\)/) + dts.should match(/<option value="8" selected>August<\/option>/) + dts.should match(/expected_date\(day\)/) + dts.should match(/<option value="24" selected>24<\/option>/) + end + end describe "params" do test/unit/view_helpers/date_time_helpers_spec.rb 714773dac1872c8b6dabcb5147e88ef6ac9f0f47 Mark Bates mark@markbates.com http://github.com/markbates/mack/commit/776c59749b58fffae02ca90cf232672cd4b6b65a 776c59749b58fffae02ca90cf232672cd4b6b65a 2008-08-18T11:49:16-07:00 2008-08-18T11:49:16-07:00 Fixed bug where date_select and date_time_select wouldn't work with 'non-models' 8b89f4a65e806bbf703ab067e8fb42c8ce99222d Mark Bates mark@markbates.com