Feature #8488 » private_issue_watchers_FIXED_1.3.diff
| app/models/issue.rb (working copy) | ||
|---|---|---|
|
validates_numericality_of :estimated_hours, :allow_nil => true
|
||
|
validate :validate_issue
|
||
|
named_scope :visible, lambda {|*args| { :include => :project,
|
||
|
named_scope :visible, lambda {|*args| { :include => [:project, :watchers],
|
||
|
:conditions => Issue.visible_condition(args.shift || User.current, *args) } }
|
||
|
named_scope :open, :conditions => ["#{IssueStatus.table_name}.is_closed = ?", false], :include => :status
|
||
| ... | ... | |
|
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 #{Watcher.table_name}.user_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))"
|
||
|
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 #{Watcher.table_name}.user_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))"
|
||
|
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 after_initialize
|
||
|
if new_record?
|
||
|
# set default values for new records only
|
||
| app/models/journal.rb (working copy) | ||
|---|---|---|
|
" (#{JournalDetail.table_name}.prop_key = 'status_id' OR #{Journal.table_name}.notes <> '')"}
|
||
|
named_scope :visible, lambda {|*args| {
|
||
|
:include => {:issue => :project},
|
||
|
:include => {:issue => [:project, :watchers]},
|
||
|
:conditions => Issue.visible_condition(args.shift || User.current, *args)
|
||
|
}}
|
||