From bedde860a4eccfc68179b51ef07e2cb8910f38d9 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Thu, 13 Sep 2012 19:02:08 +0800 Subject: [PATCH] minor shit updates --- Gemfile | 2 +- .../built_in_modules/calendar/app/models/event.rb | 8 +++++++- vendor/built_in_modules/gallery/gallery.json | 14 ++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 vendor/built_in_modules/gallery/gallery.json diff --git a/Gemfile b/Gemfile index ca1f0805..34f7100a 100644 --- a/Gemfile +++ b/Gemfile @@ -33,7 +33,7 @@ gem 'tinymce-rails' gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux") gem 'mongoid-encryptor', :require => 'mongoid/encryptor' #gem 'contacts' -gem 'event-calendar', :require => 'event_calendar' +gem 'event-calendar', :require => 'event_calendar'#, :git => 'git://github.com/elevation/event_calendar.git' gem "impressionist", :require => "impressionist", :path => "vendor/impressionist" diff --git a/vendor/built_in_modules/calendar/app/models/event.rb b/vendor/built_in_modules/calendar/app/models/event.rb index 56c34400..b53963aa 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 diff --git a/vendor/built_in_modules/gallery/gallery.json b/vendor/built_in_modules/gallery/gallery.json new file mode 100644 index 00000000..5f268589 --- /dev/null +++ b/vendor/built_in_modules/gallery/gallery.json @@ -0,0 +1,14 @@ +{ + "title": "gallery", + "version": "0.1", + "organization": "Rulingcom", + "author": "Visual dep", + "intro": "A simple and amazing gallery", + "update_info": "Some info", + "create_date": "11-08-2012", + "app_pages": ["albums"], + "widgets": ["albums"], + "category": ["gallery_categories"], + "widget_fields":[], + "enable_frontend": true +}