jro_apps/redmine Commit - r5715:5d4e4f241c61

5

6

def index

6

def index

7

@days = Setting.activity_days_default.to_i

7

@days = Setting.activity_days_default.to_i

8

9

if params[:from]

9

if params[:from]

10

begin; @date_to = params[:from].to_date + 1; rescue; end

10

begin; @date_to = params[:from].to_date + 1; rescue; end

11

end

11

end

14

@date_from = @date_to - @days

14

@date_from = @date_to - @days

15

@with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')

15

@with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')

16

@author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))

16

@author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))

17

18

@activity = Redmine::Activity::Fetcher.new(User.current, :project => @project,

18

@activity = Redmine::Activity::Fetcher.new(User.current, :project => @project,

19

:with_subprojects => @with_subprojects,

19

:with_subprojects => @with_subprojects,

20

:author => @author)

20

:author => @author)

21

@activity.scope_select {|t| !params["show_#{t}"].nil?}

21

@activity.scope_select {|t| !params["show_#{t}"].nil?}

22

@activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?

22

@activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?

23

24

events = @activity.events(@date_from, @date_to)

24

events = @activity.events(@date_from, @date_to)

25

26

if events.empty? || stale?(:etag => [@activity.scope, @date_to, @date_from, @with_subprojects, @author, events.first, User.current, current_language])

26

if events.empty? || stale?(:etag => [@activity.scope, @date_to, @date_from, @with_subprojects, @author, events.first, User.current, current_language])

27

respond_to do |format|

27

respond_to do |format|

28

format.html {

28

format.html {

29

@events_by_day = events.group_by(&:event_date)

29

@events_by_day = events.group_by(&:event_date)

30

render :layout => false if request.xhr?

30

render :layout => false if request.xhr?

31

}

31

}

40

}

40

}

41

end

41

end

42

end

42

end

43

44

rescue ActiveRecord::RecordNotFound

44

rescue ActiveRecord::RecordNotFound

45

render_404

45

render_404

46

end

46

end

55

rescue ActiveRecord::RecordNotFound

55

rescue ActiveRecord::RecordNotFound

56

render_404

56

render_404

57

end

57

end

58

59

end

58

end

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

               def index
                 @days = Setting.activity_days_default.to_i
                 if params[:from]
                   begin; @date_to = params[:from].to_date + 1; rescue; end
                 end
                 @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,
                                                                          :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 {
                       @events_by_day = events.group_by(&:event_date)
                       render :layout => false if request.xhr?
                     }
                     }
                   end
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end