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

diff --git a/app/models/time_entry_import.rb b/app/models/time_entry_import.rb
index 125eee093996121393f7f8c4a0de8648d55444ec..66b762f74b6977c36b9ac1a7487dbfbdeee8141e 100644 (file)
--- 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 2de12180666202fac80674666dd3f35fd8ad265a..e33855cd81820700d7cd0c3c2361cbab00ca5958 100644 (file)
--- 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 %>

diff --git a/lib/redmine.rb b/lib/redmine.rb
index f1d5c85c5b20e1f125c583ca0e9f95da4f4ff1bb..31a62c0a8eb3c5d51a7997c37b21ba63e5d1aac4 100644 (file)
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -132,6 +132,7 @@ Redmine::AccessControl.map do |map|
     map.permission :edit_own_time_entries, {:timelog => [:edit, :update, :destroy,:bulk_edit, :bulk_update]}, :require => :loggedin
     map.permission :manage_project_activities, {:projects => :settings, :project_enumerations => [:update, :destroy]}, :require => :member
     map.permission :log_time_for_other_users, :require => :member
+    map.permission :import_time_entries, {}
   end
 
   map.project_module :news do |map|

diff --git a/test/fixtures/roles.yml b/test/fixtures/roles.yml
index 62da630c79bd0bf1fd50cbb55c577ca2394aadd3..13433874e8f3c0ad81d01d7ff71cdb6ae7bd03a3 100644 (file)
--- a/test/fixtures/roles.yml
+++ b/test/fixtures/roles.yml
@@ -36,6 +36,7 @@ roles_001:
     - :view_time_entries
     - :edit_time_entries
     - :delete_time_entries
+    - :import_time_entries
     - :view_news
     - :manage_news
     - :comment_news
@@ -215,4 +216,3 @@ roles_005:
     - :view_changesets
 
   position: 1
-