summaryrefslogtreecommitdiffstats
path: root/app/controllers/context_menus_controller.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2011-11-24 21:31:21 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2011-11-24 21:31:21 +0000
commit703211c0a6bec8037105d2964f663c6492923f17 (patch)
tree612c0f8c1fba2dd2f78cb8012a3398d582570921 /app/controllers/context_menus_controller.rb
parentf436918dbee678a66d5228341385ae2c9e462a03 (diff)
downloadredmine-703211c0a6bec8037105d2964f663c6492923f17.tar.gz
redmine-703211c0a6bec8037105d2964f663c6492923f17.zip
Fixed time entries context menu display according permissions (#9405).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7922 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/context_menus_controller.rb')
-rw-r--r--app/controllers/context_menus_controller.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/context_menus_controller.rb b/app/controllers/context_menus_controller.rb
index 7e83d35d5..defadb230 100644
--- a/app/controllers/context_menus_controller.rb
+++ b/app/controllers/context_menus_controller.rb
@@ -51,9 +51,8 @@ class ContextMenusController < ApplicationController
@projects = @time_entries.collect(&:project).compact.uniq
@project = @projects.first if @projects.size == 1
@activities = TimeEntryActivity.shared.active
- @can = {:edit => User.current.allowed_to?(:log_time, @projects),
- :update => User.current.allowed_to?(:log_time, @projects),
- :delete => User.current.allowed_to?(:log_time, @projects)
+ @can = {:edit => User.current.allowed_to?(:edit_time_entries, @projects),
+ :delete => User.current.allowed_to?(:edit_time_entries, @projects)
}
@back = back_url
render :layout => false