summaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-03-14 21:17:09 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-03-14 21:17:09 +0000
commit993b60d61eb927cff21ea0b06c1631eb986f6a51 (patch)
tree940e5d4f7c08e2e8dfcf02839c63cac8587c44a1 /app/models
parent4957752d122388f15738b47b2872465da81a6d32 (diff)
downloadredmine-993b60d61eb927cff21ea0b06c1631eb986f6a51.tar.gz
redmine-993b60d61eb927cff21ea0b06c1631eb986f6a51.zip
Adds 2 permissions (closes #859):
* edit_time_entries: lets a user edit/delete any time entry * edit_own_time_entries: lets a user edit/delete its own time entries only git-svn-id: http://redmine.rubyforge.org/svn/trunk@1249 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models')
-rw-r--r--app/models/time_entry.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb
index 0f8f62889..bcf6d1223 100644
--- a/app/models/time_entry.rb
+++ b/app/models/time_entry.rb
@@ -50,7 +50,7 @@ class TimeEntry < ActiveRecord::Base
# Returns true if the time entry can be edited by usr, otherwise false
def editable_by?(usr)
- usr == self.user
+ (usr == user && usr.allowed_to?(:edit_own_time_entries, project)) || usr.allowed_to?(:edit_time_entries, project)
end
def self.visible_by(usr)