enju_event 0.0.20 → 0.0.21

data/app/models/event.rb

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 class Event < ActiveRecord::Base
   attr_accessible :library_id, :event_category_id, :name, :note, :start_at,
-    :event_at, :all_day, :display_name
+    :end_at, :all_day, :display_name
 
   scope :closing_days, includes(:event_category).where('event_categories.name = ?', 'closed')
   scope :on, lambda {|datetime| where('start_at >= ? AND start_at < ?', datetime.beginning_of_day, datetime.tomorrow.beginning_of_day + 1)}

data/app/models/event_import_file.rb

@@ -1,7 +1,7 @@
 class EventImportFile < ActiveRecord::Base
-  attr_accessible :event_import
+  attr_accessible :event_import, :edit_mode
   include ImportFile
-  default_scope :order => 'id DESC'
+  default_scope :order => 'event_import_files.id DESC'
   scope :not_imported, where(:state => 'pending')
   scope :stucked, where('created_at < ? AND state = ?', 1.hour.ago, 'pending')
 

data/lib/enju_event/version.rb

@@ -1,3 +1,3 @@
 module EnjuEvent
-  VERSION = "0.0.20"
+  VERSION = "0.0.21"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_event
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-27 00:00:00.000000000 Z
+date: 2012-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails