diff options
| -rw-r--r-- | app/models/occurrence.rb | 4 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/models/occurrence.rb b/app/models/occurrence.rb index 4a5f64a..a8e76a5 100644 --- a/app/models/occurrence.rb +++ b/app/models/occurrence.rb | |||
| @@ -12,7 +12,9 @@ class Occurrence < ActiveRecord::Base | |||
| 12 | 12 | ||
| 13 | def self.find_in_range start_time, end_time | 13 | def self.find_in_range start_time, end_time |
| 14 | find( | 14 | find( |
| 15 | :all, :conditions => [ | 15 | :all, |
| 16 | :include => :node, | ||
| 17 | :conditions => [ | ||
| 16 | "start_time > ? AND end_time < ?", start_time, end_time | 18 | "start_time > ? AND end_time < ?", start_time, end_time |
| 17 | ] | 19 | ] |
| 18 | ) | 20 | ) |
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index e453bd7..72739cd 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb | |||
| @@ -80,7 +80,7 @@ | |||
| 80 | <% Occurrence.find_in_range(Time.now, (Time.now+14.days)).each do |occurrence| %> | 80 | <% Occurrence.find_in_range(Time.now, (Time.now+14.days)).each do |occurrence| %> |
| 81 | <li> | 81 | <li> |
| 82 | <div><%= l occurrence.start_time.to_date, :format => :default %></div> | 82 | <div><%= l occurrence.start_time.to_date, :format => :default %></div> |
| 83 | <a href="#"><%= occurrence.node.head.title %></a> | 83 | <%= link_to occurrence.node.head.title, occurrence.node.unique_name %></a> |
| 84 | </li> | 84 | </li> |
| 85 | <% end %> | 85 | <% end %> |
| 86 | </ul> | 86 | </ul> |
