a fix when there are no start_at or end_at dates

maccman · Jan 29, 2012 · 8c76b3a · 8c76b3a
1 parent 4d30f13
commit 8c76b3a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/app/assets/javascripts/app/models/calendar_event.js.coffee b/app/assets/javascripts/app/models/calendar_event.js.coffee
@@ -7,8 +7,8 @@ class App.CalendarEvent extends Spine.Model
 
   load: ->
     super
-    @start_at = new Date(@start_at)
-    @end_at = new Date(@end_at)
+    @start_at = new Date(@start_at) if @start_at
+    @end_at = new Date(@end_at) if @end_at
 
   @bind 'ajaxError', (_, e) ->
     if e.status is 401

diff --git a/app/assets/javascripts/app/views/dashboard/calendar.jst.eco b/app/assets/javascripts/app/views/dashboard/calendar.jst.eco
@@ -6,7 +6,7 @@
   <% for event in @events: %>
     <div class="item">
       <a href="<%= event.link %>">
-        <%= event.name %> <time><%= event.start_at.format('h:i a') %></time>
+        <%= event.name %> <time><%= event.start_at?.format('h:i a') %></time>
       </a>
     </div>
   <% end %>

diff --git a/lib/google.rb b/lib/google.rb
@@ -23,8 +23,11 @@ class Event
     def initialize(result)
       @link     = result['htmlLink']
       @name     = result['summary']
-      @start_at = Time.parse(result['start']['date'])
-      @end_at   = Time.parse(result['end']['date'])
+      @start_at = result['start']['date']
+      @end_at   = result['end']['date']
+
+      @start_at = Time.parse(@start_at) if @start_at
+      @end_at   = Time.parse(@end_at) if @end_at
     end
 
     def serializable_hash(options = nil)