]> source.dussan.org Git - redmine.git/commitdiff
remove trailing white-spaces and an empty line from activities controller source.
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Wed, 18 May 2011 07:12:04 +0000 (07:12 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Wed, 18 May 2011 07:12:04 +0000 (07:12 +0000)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5835 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/controllers/activities_controller.rb

index d6292ea9a62ae6aad822373283cd7b29b558e0ba..cd03432b21fd4bda8e8e7577585392ed5b30a3b6 100644 (file)
@@ -5,7 +5,7 @@ class ActivitiesController < ApplicationController
 
   def index
     @days = Setting.activity_days_default.to_i
-    
+
     if params[:from]
       begin; @date_to = params[:from].to_date + 1; rescue; end
     end
@@ -14,18 +14,18 @@ class ActivitiesController < ApplicationController
     @date_from = @date_to - @days
     @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
     @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
-    
-    @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project, 
+
+    @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project,
                                                              :with_subprojects => @with_subprojects,
                                                              :author => @author)
     @activity.scope_select {|t| !params["show_#{t}"].nil?}
     @activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?
 
     events = @activity.events(@date_from, @date_to)
-    
+
     if events.empty? || stale?(:etag => [@activity.scope, @date_to, @date_from, @with_subprojects, @author, events.first, User.current, current_language])
       respond_to do |format|
-        format.html { 
+        format.html {
           @events_by_day = events.group_by(&:event_date)
           render :layout => false if request.xhr?
         }
@@ -40,7 +40,7 @@ class ActivitiesController < ApplicationController
         }
       end
     end
-    
+
   rescue ActiveRecord::RecordNotFound
     render_404
   end
@@ -55,5 +55,4 @@ class ActivitiesController < ApplicationController
   rescue ActiveRecord::RecordNotFound
     render_404
   end
-
 end