summaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-08-30 13:04:34 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-08-30 13:04:34 +0000
commita5d0a7e679731d8aa4ccc5413dee0b2f5e59c381 (patch)
tree4f77c441a5c31849548fc2573b35fba79dfd5c40 /app/controllers
parent4c803780d2238bc0cb5e801b086b242088816da5 (diff)
downloadredmine-a5d0a7e679731d8aa4ccc5413dee0b2f5e59c381.tar.gz
redmine-a5d0a7e679731d8aa4ccc5413dee0b2f5e59c381.zip
remove trailing white-spaces from app/controllers/calendars_controller.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6798 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/calendars_controller.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb
index a65f39b0f..3629bf94f 100644
--- a/app/controllers/calendars_controller.rb
+++ b/app/controllers/calendars_controller.rb
@@ -5,12 +5,12 @@
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -33,11 +33,11 @@ class CalendarsController < ApplicationController
@year = params[:year].to_i
if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
@month = params[:month].to_i
- end
+ end
end
@year ||= Date.today.year
@month ||= Date.today.month
-
+
@calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month)
retrieve_query
@query.group_by = nil
@@ -47,10 +47,10 @@ class CalendarsController < ApplicationController
:conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
)
events += @query.versions(:conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
-
+
@calendar.events = events
end
-
+
render :action => 'show', :layout => false if request.xhr?
end
end