Mercurial > hg > soundsoftware-site
comparison app/controllers/.svn/text-base/calendars_controller.rb.svn-base @ 441:cbce1fd3b1b7 redmine-1.2
Update to Redmine 1.2-stable branch (Redmine SVN rev 6000)
author | Chris Cannam |
---|---|
date | Mon, 06 Jun 2011 14:24:13 +0100 |
parents | 94944d00e43c |
children |
comparison
equal
deleted
inserted
replaced
245:051f544170fe | 441:cbce1fd3b1b7 |
---|---|
1 # Redmine - project management software | |
2 # Copyright (C) 2006-2011 Jean-Philippe Lang | |
3 # | |
4 # This program is free software; you can redistribute it and/or | |
5 # modify it under the terms of the GNU General Public License | |
6 # as published by the Free Software Foundation; either version 2 | |
7 # of the License, or (at your option) any later version. | |
8 # | |
9 # This program is distributed in the hope that it will be useful, | |
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of | |
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
12 # GNU General Public License for more details. | |
13 # | |
14 # You should have received a copy of the GNU General Public License | |
15 # along with this program; if not, write to the Free Software | |
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | |
17 | |
1 class CalendarsController < ApplicationController | 18 class CalendarsController < ApplicationController |
2 menu_item :calendar | 19 menu_item :calendar |
3 before_filter :find_optional_project | 20 before_filter :find_optional_project |
4 | 21 |
5 rescue_from Query::StatementInvalid, :with => :query_statement_invalid | 22 rescue_from Query::StatementInvalid, :with => :query_statement_invalid |
34 @calendar.events = events | 51 @calendar.events = events |
35 end | 52 end |
36 | 53 |
37 render :action => 'show', :layout => false if request.xhr? | 54 render :action => 'show', :layout => false if request.xhr? |
38 end | 55 end |
39 | |
40 def update | |
41 show | |
42 end | |
43 | |
44 end | 56 end |