diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-10-28 14:02:25 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-10-28 14:02:25 +0000 |
| commit | 8a2e4aa247f2a02537eb990ed8f32dd9a6f21e56 (patch) | |
| tree | cf95e9e827101ab61b182abd9e26838cb8490631 /app | |
| parent | 81a2e5338dc18d5573da592994c000ebc8703aad (diff) | |
| download | redmine-8a2e4aa247f2a02537eb990ed8f32dd9a6f21e56.tar.gz redmine-8a2e4aa247f2a02537eb990ed8f32dd9a6f21e56.zip | |
Add permission to import time entries (#32196, #28234).
Patch by Marius BALTEANU.
git-svn-id: http://svn.redmine.org/redmine/trunk@18878 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/time_entry_import.rb | 2 | ||||
| -rw-r--r-- | app/views/timelog/index.html.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/time_entry_import.rb b/app/models/time_entry_import.rb index 125eee093..66b762f74 100644 --- a/app/models/time_entry_import.rb +++ b/app/models/time_entry_import.rb @@ -23,7 +23,7 @@ class TimeEntryImport < Import end def self.authorized?(user) - user.allowed_to?(:log_time, nil, :global => true) + user.allowed_to?(:import_time_entries, nil, :global => true) end # Returns the objects that were imported diff --git a/app/views/timelog/index.html.erb b/app/views/timelog/index.html.erb index 2de121806..e33855cd8 100644 --- a/app/views/timelog/index.html.erb +++ b/app/views/timelog/index.html.erb @@ -6,7 +6,7 @@ {:controller => 'projects', :action => 'settings', :id => @project, :tab => 'activities'}, :class => 'icon icon-settings' if User.current.allowed_to?(:manage_project_activities, @project) %> <%= actions_dropdown do %> - <% if User.current.allowed_to?(:log_time, @project, :global => true) %> + <% if User.current.allowed_to?(:import_time_entries, @project, :global => true) %> <%= link_to l(:button_import), new_time_entries_import_path %> <% end %> <% end %> |