diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-07-24 18:18:08 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-07-24 18:18:08 +0000 |
| commit | dc5e5eca6b7cb124da1e47036f8a688bb4a7688c (patch) | |
| tree | cb32b83d39d2b7897eb2f28c3fc94b4bb611d930 /app/models | |
| parent | 4069f95fd1bc98ab2b500f5f23d882d00d11bc11 (diff) | |
| download | redmine-dc5e5eca6b7cb124da1e47036f8a688bb4a7688c.tar.gz redmine-dc5e5eca6b7cb124da1e47036f8a688bb4a7688c.zip | |
Fixed that displaying time entries with custom field column raises an error (#5037).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12041 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/custom_field.rb | 4 | ||||
| -rw-r--r-- | app/models/issue_custom_field.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb index c2b717d0e..f469bc534 100644 --- a/app/models/custom_field.rb +++ b/app/models/custom_field.rb @@ -76,6 +76,10 @@ class CustomField < ActiveRecord::Base CUSTOM_FIELDS_NAMES = CUSTOM_FIELDS_TABS.collect{|v| v[:name]} + def visible_by?(project, user=User.current) + visible? || user.admin? + end + def field_format=(arg) # cannot change format of a saved custom field super if new_record? diff --git a/app/models/issue_custom_field.rb b/app/models/issue_custom_field.rb index 9ddedc882..e811ccaae 100644 --- a/app/models/issue_custom_field.rb +++ b/app/models/issue_custom_field.rb @@ -25,7 +25,7 @@ class IssueCustomField < CustomField end def visible_by?(project, user=User.current) - visible? || user.admin? || (roles & user.roles_for_project(project)).present? + super || (roles & user.roles_for_project(project)).present? end def validate_custom_field |