diff --git a/Gemfile b/Gemfile index 3e45ea1c0..61672d012 100644 --- a/Gemfile +++ b/Gemfile @@ -51,7 +51,7 @@ gem 'rb-readline' if RUBY_PLATFORM.downcase.include?("linux") gem "impressionist", :git => 'git://github.com/charlotte-ruby/impressionist.git' #gem 'contacts' -gem 'event-calendar', :require => 'event_calendar' +gem 'event-calendar', :require => 'event_calendar'#, :git => 'git://github.com/elevation/event_calendar.git' gem 'redis','>= 2.1.1' gem 'chinese_pinyin', '0.4.1' diff --git a/vendor/built_in_modules/calendar/app/models/event.rb b/vendor/built_in_modules/calendar/app/models/event.rb index 56c344000..b53963aac 100644 --- a/vendor/built_in_modules/calendar/app/models/event.rb +++ b/vendor/built_in_modules/calendar/app/models/event.rb @@ -1,4 +1,10 @@ class Event include Mongoid::Document - has_event_calendar + include EventCalendar + has_event_calendar + + # def self.events_for_date_range(start_d, end_d, find_options = {}) + # where(find_options.merge(self.end_at_field.to_sym.lt => end_d.to_time.utc, + # self.start_at_field.to_sym.gt => start_d.to_time.utc)).asc(self.start_at_field) + # end end