diff options
| author | Go MAEDA <maeda@farend.jp> | 2024-11-03 05:51:52 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2024-11-03 05:51:52 +0000 |
| commit | f6cf0e72871f9a635eaa95392fefdf48e07728b1 (patch) | |
| tree | d6617d7d377237f1a3fd85b9d09ef14532044527 /app | |
| parent | 2c802a2bdf3ad125a4051f9b04a96a9b51e0661b (diff) | |
| download | redmine-f6cf0e72871f9a635eaa95392fefdf48e07728b1.tar.gz redmine-f6cf0e72871f9a635eaa95392fefdf48e07728b1.zip | |
Merged r23178 from trunk to 5.1-stable (#41465).
git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@23179 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/issue_import.rb | 2 | ||||
| -rw-r--r-- | app/models/time_entry_import.rb | 2 | ||||
| -rw-r--r-- | app/views/issues/index.html.erb | 2 | ||||
| -rw-r--r-- | app/views/timelog/index.html.erb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/models/issue_import.rb b/app/models/issue_import.rb index d7e0919d3..57305e38f 100644 --- a/app/models/issue_import.rb +++ b/app/models/issue_import.rb @@ -50,7 +50,7 @@ class IssueImport < Import end def self.authorized?(user) - user.allowed_to?(:import_issues, nil, :global => true) + user.allowed_to?(:import_issues, nil, :global => true) && user.allowed_to?(:add_issues, nil, :global => true) end # Returns the objects that were imported diff --git a/app/models/time_entry_import.rb b/app/models/time_entry_import.rb index a6d05f520..01fde3488 100644 --- a/app/models/time_entry_import.rb +++ b/app/models/time_entry_import.rb @@ -32,7 +32,7 @@ class TimeEntryImport < Import end def self.authorized?(user) - user.allowed_to?(:import_time_entries, nil, :global => true) + user.allowed_to?(:import_time_entries, nil, :global => true) && user.allowed_to?(:log_time, nil, :global => true) end # Returns the objects that were imported diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 997a64e55..796c56f0a 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -7,7 +7,7 @@ <%= link_to l(:field_summary), project_issues_report_path(@project), :class => 'icon icon-stats' %> <% end %> - <% if User.current.allowed_to?(:import_issues, @project, :global => true) %> + <% if User.current.allowed_to?(:import_issues, @project, :global => true) && User.current.allowed_to?(:add_issues, @project, :global => true) %> <%= link_to l(:button_import), new_issues_import_path(:project_id => @project), :class => 'icon icon-import' %> <% end %> diff --git a/app/views/timelog/index.html.erb b/app/views/timelog/index.html.erb index a045e4743..d9db32405 100644 --- a/app/views/timelog/index.html.erb +++ b/app/views/timelog/index.html.erb @@ -3,7 +3,7 @@ _new_time_entry_path(@project, @query.filtered_issue_id), :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) %> <%= actions_dropdown do %> - <% if User.current.allowed_to?(:import_time_entries, @project, :global => true) %> + <% if User.current.allowed_to?(:import_time_entries, @project, :global => true) && User.current.allowed_to?(:log_time, @project, :global => true) %> <%= link_to l(:button_import), new_time_entries_import_path(:project_id => @project), :class => 'icon icon-import' %> <% end %> |