activity-store-user-selection.diff

Go MAEDA, 2015-10-06 02:19

Download (1.05 KB)

View differences:

app/controllers/activities_controller.rb (working copy)
37 37
    @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project,
38 38
                                                             :with_subprojects => @with_subprojects,
39 39
                                                             :author => @author)
40
    pref = User.current.pref
40 41
    @activity.scope_select {|t| !params["show_#{t}"].nil?}
41
    @activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?
42
    if @activity.scope.present?
43
      pref['activity_scope'] = @activity.scope
44
      pref.save
45
    else
46
      if @author.nil?
47
        scope = pref['activity_scope'].to_a & @activity.event_types
48
        @activity.scope = scope.present? ? scope : :default
49
      else
50
        @activity.scope = :all
51
      end
52
    end
42 53

  
43 54
    events = @activity.events(@date_from, @date_to)
44 55