Project

General

Profile

Patch #14318 » allow_watchers_and_contributers_access_to_issues_3.2.0.patch

Fabrizio Sebastiani, 2016-04-06 23:26

View differences:

./app/models/issue.rb 2016-04-06 10:05:57.755051963 +0200
when 'own'
user_ids = [user.id] + user.groups.map(&:id).compact
"(#{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))"
when 'own_watch'
user_ids = [user.id] + user.groups.map(&:id)
"(#{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}) OR #{table_name}.id IN (SELECT watchable_id FROM watchers WHERE user_id=#{user.id} AND watchable_type = 'Issue'))"
when 'own_watch_contributed'
user_ids = [user.id] + user.groups.map(&:id)
"(#{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}) OR #{table_name}.id IN (SELECT watchable_id FROM watchers WHERE user_id=#{user.id} AND watchable_type = 'Issue') OR #{table_name}.id IN (SELECT journalized_id FROM journals where journalized_type = 'Issue' AND user_id=#{user.id} GROUP BY journalized_id))"
else
'1=0'
end
......
!self.is_private? || (self.author == user || user.is_or_belongs_to?(assigned_to))
when 'own'
self.author == user || user.is_or_belongs_to?(assigned_to)
when 'own_watch'
self.author == user || user.is_or_belongs_to?(assigned_to) || self.watched_by?(user)
when 'own_watch_contributed'
self.author == user || user.is_or_belongs_to?(assigned_to) || self.watched_by?(user) || self.journals.where('journalized_id = ?', self.id).where('user_id = ?', user).count > 0
else
false
end
./app/models/role.rb 2016-04-06 10:05:57.755051963 +0200
ISSUES_VISIBILITY_OPTIONS = [
['all', :label_issues_visibility_all],
['default', :label_issues_visibility_public],
['own', :label_issues_visibility_own]
['own', :label_issues_visibility_own],
['own_watch', :label_issues_visibility_own_watch],
['own_watch_contributed', :label_issues_visibility_own_watch_contributed]
]
TIME_ENTRIES_VISIBILITY_OPTIONS = [
./config/locales/en.yml 2016-04-06 10:12:27.884900611 +0200
setting_search_results_per_page: Search results per page
setting_attachment_extensions_allowed: Allowed extensions
setting_attachment_extensions_denied: Disallowed extensions
setting_enable_watcher_issue_visibility: Enable watcher issue visibility
permission_add_project: Create project
permission_add_subprojects: Create subprojects
......
label_create_missing_values: Create missing values
label_api: API
label_field_format_enumeration: Key/value list
label_issues_visibility_own_watch: Issues created by, assigned to, or watched by the user
label_issues_visibility_own_watch_contributed: Issues created by, assigned to, watched by, or contributed to by the user
button_login: Login
button_submit: Submit
./test/unit/issue_test.rb 2016-04-06 10:05:57.756051955 +0200
assert_visibility_match user, issues
end
def test_visible_scope_for_non_member_with_own_watch_issues_visibility
#Role.non_member.add_permission! :view_issues
Role.non_member.update_attribute :issues_visibility, 'own_watch'
user = User.find(9)
assert user.projects.empty?
own_issue = Issue.create!(:project_id => 1, :tracker_id => 1, :author_id => user.id, :subject => 'Issue by non member')
watching_issue = Issue.create!(:project_id => 1, :tracker_id => 1, :author_id => 1, :subject => 'Issue watched by non member')
watching_issue.add_watcher(user)
#assert_equal true, own_issue.visible?(user)
#assert_equal true, watching_issue.visible?(user)
assert_visibility_match user, [own_issue, watching_issue]
end
def test_visible_scope_for_non_member_with_own_watch_contributed_issues_visibility
#Role.non_member.add_permission! :view_issues
Role.non_member.update_attribute :issues_visibility, 'own_watch_contributed'
user = User.find(9)
assert user.projects.empty?
own_issue = Issue.create!(:project_id => 1, :tracker_id => 1, :author_id => user.id, :subject => 'Issue by non member')
watching_issue = Issue.create!(:project_id => 1, :tracker_id => 1, :author_id => 1, :subject => 'Issue watched by non member')
watching_issue.add_watcher(user)
watching_issue.reload
contributed_issue = Issue.create!(:project_id => 1, :tracker_id => 1, :author_id => 1, :subject => 'Issue contributed by non member')
journal = contributed_issue.init_journal(user)
journal.notes = 'journal notes'
journal.save!
#assert_equal true, own_issue.visible?(user)
#assert_equal true, watching_issue.visible?(user)
#assert_equal true, contributed_issue.visible?(user)
assert_visibility_match user, [own_issue, watching_issue, contributed_issue]
end
def test_visible_scope_for_non_member_without_view_issues_permissions
# Non member user should not see issues without permission
Role.non_member.remove_permission!(:view_issues)
......
:assigned_to => user.groups.first,
:is_private => true)
Role.find(2).update_attribute :issues_visibility, 'default'
issues = Issue.visible(User.find(8)).to_a
assert issues.any?
assert issues.include?(issue)
['default', 'own', 'own_watch', 'own_watch_contributed'].each do |issue_visibility|
Role.find(2).update_attribute :issues_visibility, issue_visibility
issues = Issue.visible(User.find(8)).to_a
assert issues.any?
assert_include issue, issues
end
end
Role.find(2).update_attribute :issues_visibility, 'own'
issues = Issue.visible(User.find(8)).to_a
def test_visible_scope_for_non_member_and_watcher_should_return_watching_issues
user = User.find(9)
assert user.projects.empty?
Role.non_member.add_permission!(:view_issues)
issue = Issue.create!(:project_id => 1, :tracker_id => 1, :author_id => 1, :subject => 'Issue visible to watcher', :is_private => true)
issue.add_watcher(user)
['own_watch', 'own_watch_contributed'].each do |issue_visibility|
Role.non_member.update_attribute :issues_visibility, issue_visibility
issues = Issue.visible(user).to_a
assert issues.any?
assert_include issue, issues
end
end
def test_visible_scope_for_non_member_and_contributer_should_return_contributing_issues
user = User.find(9)
assert user.projects.empty?
Role.non_member.add_permission!(:view_issues)
issue = Issue.create!(:project_id => 1, :tracker_id => 1, :author_id => 1, :subject => 'Issue visible to watcher', :is_private => true)
journal = issue.init_journal(user)
journal.notes = 'journal notes'
journal.save!
Role.non_member.update_attribute :issues_visibility, 'own_watch_contributed'
issues = Issue.visible(user).to_a
assert issues.any?
assert_include issue, issues
end
(5-5/15)