Mercurial > hg > soundsoftware-site
comparison app/controllers/calendars_controller.rb @ 22:40f7cfd4df19
* Update to SVN trunk rev 4173
author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
---|---|
date | Fri, 24 Sep 2010 14:06:04 +0100 |
parents | 1d32c0a0efbf |
children | 94944d00e43c |
comparison
equal
deleted
inserted
replaced
14:1d32c0a0efbf | 22:40f7cfd4df19 |
---|---|
30 events += @query.versions(:conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt]) | 30 events += @query.versions(:conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt]) |
31 | 31 |
32 @calendar.events = events | 32 @calendar.events = events |
33 end | 33 end |
34 | 34 |
35 render :layout => false if request.xhr? | 35 render :action => 'show', :layout => false if request.xhr? |
36 end | 36 end |
37 | 37 |
38 def update | |
39 show | |
40 end | |
38 | 41 |
39 end | 42 end |