Mercurial > hg > soundsoftware-site
comparison app/views/activities/_busy_institution.html.erb @ 1081:b56a4c5afa35 bug_531
Merge from branch cannam
| author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
|---|---|
| date | Thu, 22 Nov 2012 17:26:15 +0000 |
| parents | 967fb7e62b1d |
| children |
comparison
equal
deleted
inserted
replaced
| 1018:d78b06240b73 | 1081:b56a4c5afa35 |
|---|---|
| 1 <% events = @events_by_day %> | 1 <% events = @events_by_day %> |
| 2 <% if (events.nil?) | 2 <% if (events.nil?) |
| 3 activity = Redmine::Activity::Fetcher.new(User.current) | 3 activity = Redmine::Activity::Fetcher.new(User.anonymous) |
| 4 events = activity.events(Date.today - 14, Date.today + 1) | 4 days = Setting.activity_days_default.to_i |
| 5 events = activity.events(Date.today - days, Date.today + 1) | |
| 5 end | 6 end |
| 6 %> | 7 %> |
| 7 | 8 |
| 8 <% if events.empty? %> | 9 <% if events.empty? %> |
| 9 | 10 |
| 22 </li> | 23 </li> |
| 23 | 24 |
| 24 <% end %> | 25 <% end %> |
| 25 </ul> | 26 </ul> |
| 26 <% end %> | 27 <% end %> |
| 28 |