Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-04-01 18:21:12 +02:00
Code Issues Packages Projects Releases Activity

Merged r23178 from trunk to 5.1-stable (#41465).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@23179 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2024-11-03 05:51:52 +00:00
parent 2c802a2bdf
commit f6cf0e7287
5 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/issue_import.rb
View File

@@ -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

2
app/models/time_entry_import.rb
View File

@@ -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

2
app/views/issues/index.html.erb
View File

@@ -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 %>

2
app/views/timelog/index.html.erb
View File

@@ -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 %>

12
test/functional/imports_controller_test.rb
View File

@@ -52,6 +52,18 @@ class ImportsControllerTest < Redmine::ControllerTest
assert_select 'input[name=?][type=?][value=?]', 'project_id', 'hidden', 'subproject1'
end
def test_new_issue_import_without_add_issues_permission
Role.all.map { |role| role.remove_permission! :add_issues }
get(:new, :params => {:type => 'IssueImport', :project_id => 'subproject1'})
assert_response :forbidden
end
def test_new_time_entry_import_without_log_time_permission
Role.all.map { |role| role.remove_permission! :log_time }
get(:new, :params => {:type => 'TimeEntryImport', :project_id => 'subproject1'})
assert_response :forbidden
end
def test_create_should_save_the_file
import = new_record(Import) do
post(