Project

General

Profile

Feature #8488 » private_issue_watchers_2.2_FIXED_6.diff

Krzysztof Wosinski, 2014-04-08 08:02

View differences:

app/models/issue.rb
# Returns a SQL conditions string used to find all issues visible by the specified user
def self.visible_condition(user, options={})
Project.allowed_to_condition(user, :view_issues, options) do |role, user|
# Keep the code DRY
if [ 'default', 'own' ].include?(role.issues_visibility)
user_ids = [user.id] + user.groups.map(&:id).compact
watched_issues = Issue.watched_by(user).map(&:id)
watched_issues_clause = watched_issues.empty? ? "" : " OR #{table_name}.id IN (#{watched_issues.join(',')})"
end
if user.logged?
case role.issues_visibility
when 'all'
nil
when 'default'
user_ids = [user.id] + user.groups.map(&:id)
"(#{table_name}.is_private = #{connection.quoted_false} OR #{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))"
"(#{table_name}.is_private = #{connection.quoted_false} OR #{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}) #{watched_issues_clause})"
when 'own'
user_ids = [user.id] + user.groups.map(&:id)
"(#{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))"
"(#{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}) #{watched_issues_clause})"
else
'1=0'
end
......
when 'all'
true
when 'default'
!self.is_private? || (self.author == user || user.is_or_belongs_to?(assigned_to))
!self.is_private? || (self.author == user || self.watched_by?(user) || user.is_or_belongs_to?(assigned_to))
when 'own'
self.author == user || user.is_or_belongs_to?(assigned_to)
self.author == user || self.watched_by?(user) || user.is_or_belongs_to?(assigned_to)
else
false
end
......
end
end
# Override the acts_as_watchble default to allow any user with view issues
# rights to watch/see this issue.
def addable_watcher_users
users = self.project.users.sort - self.watcher_users
users.reject! {|user| !user.allowed_to?(:view_issues, self.project)}
users
end
def initialize(attributes=nil, *args)
super
if new_record?
(13-13/14)