Browse Source

Time Entries context menu shows activities not available for the time entry's project (#23922).

Patch by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@15952 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/3.4.0
Jean-Philippe Lang 7 years ago
parent
commit
88ab6dd946
1 changed files with 5 additions and 2 deletions
  1. 5
    2
      app/controllers/context_menus_controller.rb

+ 5
- 2
app/controllers/context_menus_controller.rb View File

@@ -59,7 +59,10 @@ class ContextMenusController < ApplicationController
end

def time_entries
@time_entries = TimeEntry.where(:id => params[:ids]).preload(:project, :user).to_a
@time_entries = TimeEntry.where(:id => params[:ids]).
preload(:project => :time_entry_activities).
preload(:user).to_a

(render_404; return) unless @time_entries.present?
if (@time_entries.size == 1)
@time_entry = @time_entries.first
@@ -67,7 +70,7 @@ class ContextMenusController < ApplicationController

@projects = @time_entries.collect(&:project).compact.uniq
@project = @projects.first if @projects.size == 1
@activities = TimeEntryActivity.shared.active
@activities = @projects.map(&:activities).reduce(:&)

edit_allowed = @time_entries.all? {|t| t.editable_by?(User.current)}
@can = {:edit => edit_allowed, :delete => edit_allowed}

Loading…
Cancel
Save