| <%= l(:label_spent_time) %> |
<%= link_to html_hours(l_hours(@version.spent_hours)),
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1ce9996cf1..a8116af1d2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -548,6 +548,7 @@ en:
permission_delete_issue_watchers: Delete watchers
permission_log_time: Log spent time
permission_view_time_entries: View spent time
+ permission_view_estimated_hours: View estimated time
permission_edit_time_entries: Edit time logs
permission_edit_own_time_entries: Edit own time logs
permission_view_news: View news
diff --git a/db/migrate/20220729101502_add_view_estimated_hours_to_all_existing_roles.rb b/db/migrate/20220729101502_add_view_estimated_hours_to_all_existing_roles.rb
new file mode 100644
index 0000000000..686a993825
--- /dev/null
+++ b/db/migrate/20220729101502_add_view_estimated_hours_to_all_existing_roles.rb
@@ -0,0 +1,9 @@
+class AddViewEstimatedHoursToAllExistingRoles < ActiveRecord::Migration[6.1]
+ def up
+ Role.all.each { |role| role.add_permission! :view_estimated_hours }
+ end
+
+ def down
+ Role.all.each { |role| role.remove_permission! :view_estimated_hours }
+ end
+end
diff --git a/lib/redmine/default_data/loader.rb b/lib/redmine/default_data/loader.rb
index e86f1e87d7..baf7556e15 100644
--- a/lib/redmine/default_data/loader.rb
+++ b/lib/redmine/default_data/loader.rb
@@ -71,6 +71,7 @@ module Redmine
:view_calendar,
:log_time,
:view_time_entries,
+ :view_estimated_hours,
:view_news,
:comment_news,
:view_documents,
@@ -102,6 +103,7 @@ module Redmine
:view_calendar,
:log_time,
:view_time_entries,
+ :view_estimated_hours,
:view_news,
:comment_news,
:view_documents,
@@ -122,6 +124,7 @@ module Redmine
:view_gantt,
:view_calendar,
:view_time_entries,
+ :view_estimated_hours,
:view_news,
:comment_news,
:view_documents,
@@ -137,6 +140,7 @@ module Redmine
:view_gantt,
:view_calendar,
:view_time_entries,
+ :view_estimated_hours,
:view_news,
:view_documents,
:view_wiki_pages,
diff --git a/lib/redmine/export/pdf/issues_pdf_helper.rb b/lib/redmine/export/pdf/issues_pdf_helper.rb
index 2f6e12dea6..b61089b7f6 100644
--- a/lib/redmine/export/pdf/issues_pdf_helper.rb
+++ b/lib/redmine/export/pdf/issues_pdf_helper.rb
@@ -57,7 +57,8 @@ module Redmine
right << [l(:field_start_date), format_date(issue.start_date)] unless issue.disabled_core_fields.include?('start_date')
right << [l(:field_due_date), format_date(issue.due_date)] unless issue.disabled_core_fields.include?('due_date')
right << [l(:field_done_ratio), "#{issue.done_ratio}%"] unless issue.disabled_core_fields.include?('done_ratio')
- right << [l(:field_estimated_hours), l_hours(issue.estimated_hours)] unless issue.disabled_core_fields.include?('estimated_hours')
+ right << [l(:field_estimated_hours), l_hours(issue.estimated_hours)] if \
+ User.current.allowed_to?(:view_estimated_hours, issue.project) && !issue.disabled_core_fields.include?('estimated_hours')
right << [l(:label_spent_time), l_hours(issue.total_spent_hours)] if User.current.allowed_to?(:view_time_entries, issue.project)
rows = left.size > right.size ? left.size : right.size
diff --git a/lib/redmine/preparation.rb b/lib/redmine/preparation.rb
index d006923bc9..64928f1773 100644
--- a/lib/redmine/preparation.rb
+++ b/lib/redmine/preparation.rb
@@ -84,6 +84,7 @@ module Redmine
map.project_module :time_tracking do |map|
map.permission :view_time_entries, {:timelog => [:index, :report, :show]}, :read => true
+ map.permission :view_estimated_hours, {}, :read => true
map.permission :log_time, {:timelog => [:new, :create]}, :require => :loggedin
map.permission :edit_time_entries,
{:timelog => [:edit, :update, :destroy, :bulk_edit, :bulk_update]},
diff --git a/test/fixtures/roles.yml b/test/fixtures/roles.yml
index 076d347ff7..9a8eeba005 100644
--- a/test/fixtures/roles.yml
+++ b/test/fixtures/roles.yml
@@ -35,6 +35,7 @@ roles_001:
- :view_calendar
- :log_time
- :view_time_entries
+ - :view_estimated_hours
- :edit_time_entries
- :delete_time_entries
- :import_time_entries
@@ -102,6 +103,7 @@ roles_002:
- :view_calendar
- :log_time
- :view_time_entries
+ - :view_estimated_hours
- :edit_own_time_entries
- :view_news
- :manage_news
@@ -151,6 +153,7 @@ roles_003:
- :view_calendar
- :log_time
- :view_time_entries
+ - :view_estimated_hours
- :view_news
- :manage_news
- :comment_news
@@ -191,6 +194,7 @@ roles_004:
- :view_calendar
- :log_time
- :view_time_entries
+ - :view_estimated_hours
- :view_news
- :comment_news
- :view_documents
@@ -218,6 +222,7 @@ roles_005:
- :view_gantt
- :view_calendar
- :view_time_entries
+ - :view_estimated_hours
- :view_news
- :view_documents
- :view_wiki_pages
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 9028141f30..97431e71cb 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -1581,6 +1581,18 @@ class IssuesControllerTest < Redmine::ControllerTest
assert_select 'table.issues td.total_estimated_hours'
end
+ def test_index_should_not_show_estimated_hours_column_without_permission
+ Role.anonymous.remove_permission! :view_estimated_hours
+ get(
+ :index,
+ :params => {
+ :set_filter => 1,
+ :c => %w(subject estimated_hours)
+ }
+ )
+ assert_select 'td.estimated_hours', 0
+ end
+
def test_index_should_not_show_spent_hours_column_without_permission
Role.anonymous.remove_permission! :view_time_entries
get(
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 9b0076862e..90d8ab30b8 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -837,6 +837,25 @@ class ProjectsControllerTest < Redmine::ControllerTest
end
end
+ def test_show_by_non_admin_user_with_view_estimated_hours_permission_should_show_estimated_time
+ @request.session[:user_id] = 2 # manager
+ get(:show, :params => {:id => 'ecookbook'})
+
+ assert_select 'div.spent_time.box>ul' do
+ assert_select '>li', :text => 'Estimated time: 203:30 hours'
+ end
+ end
+
+ def test_show_by_non_admin_user_without_view_estimated_hours_permission_should_not_show_estimated_time
+ Role.find_by(name: 'Manager').remove_permission! :view_estimated_hours
+ @request.session[:user_id] = 2 # manager
+ get(:show, :params => {:id => 'ecookbook'})
+
+ assert_select 'div.spent_time.box>ul' do
+ assert_select '>li', :text => 'Estimated time: 203.50 hours', :count => 0
+ end
+ end
+
def test_settings
@request.session[:user_id] = 2 # manager
get(:settings, :params => {:id => 1})
diff --git a/test/functional/versions_controller_test.rb b/test/functional/versions_controller_test.rb
index fdd767560b..857be51565 100644
--- a/test/functional/versions_controller_test.rb
+++ b/test/functional/versions_controller_test.rb
@@ -165,7 +165,22 @@ class VersionsControllerTest < Redmine::ControllerTest
assert_select 'a', :text => '1 open'
end
- assert_select '.time-tracking td.total-hours a:first-child', :text => '2:00 hours'
+ assert_select '.time-tracking tr:first-child' do
+ assert_select 'th', :text => 'Estimated time'
+ assert_select 'td.total-hours a', :text => '2:00 hours'
+ end
+
+ Role.non_member.remove_permission! :view_estimated_hours
+
+ get :show, :params => {:id => 4}
+ assert_response :success
+
+ assert_select 'p.progress-info' do
+ assert_select 'a', :text => '1 issue'
+ assert_select 'a', :text => '1 open'
+ end
+
+ assert_select '.time-tracking th', :text => 'Estimated time', :count => 0
end
def test_show_should_link_to_spent_time_on_version
diff --git a/test/integration/api_test/issues_test.rb b/test/integration/api_test/issues_test.rb
index 29b3390d21..2723e96656 100644
--- a/test/integration/api_test/issues_test.rb
+++ b/test/integration/api_test/issues_test.rb
@@ -489,6 +489,26 @@ class Redmine::ApiTest::IssuesTest < Redmine::ApiTest::Base
end
end
+ test "GET /issues/:id.xml should contains total_spent_hours, and should not contains estimated_hours and total_estimated_hours when permission does not exists" do
+ parent = Issue.find(3)
+ parent.update_columns :estimated_hours => 2.0
+ child = Issue.generate!(:parent_issue_id => parent.id, :estimated_hours => 3.0)
+ TimeEntry.create!(:project => child.project, :issue => child, :user => child.author, :spent_on => child.author.today,
+ :hours => '2.5', :comments => '', :activity_id => TimeEntryActivity.first.id)
+ # remove permission!
+ Role.anonymous.remove_permission! :view_estimated_hours
+
+ get '/issues/3.xml'
+
+ assert_equal 'application/xml; charset=utf-8', response.content_type
+ assert_select 'issue' do
+ assert_select 'estimated_hours', false
+ assert_select 'total_estimated_hours', false
+ assert_select 'spent_hours', parent.spent_hours.to_s
+ assert_select 'total_spent_hours', (parent.spent_hours.to_f + 2.5).to_s
+ end
+ end
+
test "GET /issues/:id.xml should contains visible spent_hours only" do
user = User.find_by_login('jsmith')
Role.find(1).update(:time_entries_visibility => 'own')
@@ -537,6 +557,25 @@ class Redmine::ApiTest::IssuesTest < Redmine::ApiTest::Base
assert_nil json['issue']['total_spent_hours']
end
+ test "GET /issues/:id.json should contains total_spent_hours, and should not contains estimated_hours and total_estimated_hours when permission does not exists" do
+ parent = Issue.find(3)
+ parent.update_columns :estimated_hours => 2.0
+ child = Issue.generate!(:parent_issue_id => parent.id, :estimated_hours => 3.0)
+ TimeEntry.create!(:project => child.project, :issue => child, :user => child.author, :spent_on => child.author.today,
+ :hours => '2.5', :comments => '', :activity_id => TimeEntryActivity.first.id)
+ # remove permission!
+ Role.anonymous.remove_permission! :view_estimated_hours
+
+ get '/issues/3.json'
+
+ assert_equal 'application/json; charset=utf-8', response.content_type
+ json = ActiveSupport::JSON.decode(response.body)
+ assert_nil json['issue']['estimated_hours']
+ assert_nil json['issue']['total_estimated_hours']
+ assert_equal parent.spent_hours, json['issue']['spent_hours']
+ assert_equal (parent.spent_hours.to_f + 2.5), json['issue']['total_spent_hours']
+ end
+
test "GET /issues/:id.json should contains visible spent_hours only" do
user = User.find_by_login('jsmith')
Role.find(1).update(:time_entries_visibility => 'own')
diff --git a/test/unit/journal_test.rb b/test/unit/journal_test.rb
index cf86a79907..f2a6936a84 100644
--- a/test/unit/journal_test.rb
+++ b/test/unit/journal_test.rb
@@ -245,6 +245,29 @@ class JournalTest < ActiveSupport::TestCase
assert_equal 2, visible_details.size
end
+ def test_visible_details_should_have_privilege_to_view_estimated_hours
+ journal = Journal.generate! do |j|
+ j.details <<
+ JournalDetail.new(:property => 'attr', :prop_key => 'estimated_hours', :old_value => '200.00', :value => '100.00')
+ end
+ project = journal.journalized.project
+
+ user = User.find(2)
+ assert user.allowed_to?(:view_estimated_hours, project)
+ visible_details = journal.visible_details(user)
+ assert_equal 1, visible_details.size
+ detail = visible_details.first
+ assert_equal 'attr', detail.property
+ assert_equal 'estimated_hours', detail.prop_key
+ assert_equal '200.00', detail.old_value
+ assert_equal '100.00', detail.value
+
+ Role.anonymous.remove_permission!(:view_estimated_hours)
+ assert !User.anonymous.allowed_to?(:view_estimated_hours, project)
+ visible_details = journal.visible_details(User.anonymous)
+ assert_equal 0, visible_details.size
+ end
+
def test_attachments
journal = Journal.new
[0, 1].map{ |i| Attachment.generate!(:file => mock_file_with_options(:original_filename => "image#{i}.png")) }.each do |attachment|
diff --git a/test/unit/mail_handler_test.rb b/test/unit/mail_handler_test.rb
index b36259c14c..c8613479a8 100644
--- a/test/unit/mail_handler_test.rb
+++ b/test/unit/mail_handler_test.rb
@@ -43,6 +43,10 @@ class MailHandlerTest < ActiveSupport::TestCase
end
def test_add_issue_with_specific_overrides
+ project = Project.find_by(name: 'OnlineStore')
+ project.enabled_module_names += [:time_tracking]
+ project.save!
+
issue =
submit_email(
'ticket_on_given_project.eml',
@@ -74,6 +78,10 @@ class MailHandlerTest < ActiveSupport::TestCase
end
def test_add_issue_with_all_overrides
+ project = Project.find_by_name('OnlineStore')
+ project.enabled_module_names += [:time_tracking]
+ project.save!
+
issue = submit_email('ticket_on_given_project.eml', :allow_override => 'all')
assert issue.is_a?(Issue)
assert !issue.new_record?
|