kolan/obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make use of #watched_by? in issue form.

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3114 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2009-12-02 19:17:42 +00:00
parent 7592a955fb
commit e5dc94fe82
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/issues/_form.rhtml
View File

@ -23,7 +23,7 @@
<% if @issue.new_record? && User.current.allowed_to?(:add_issue_watchers, @project) -%> <% if @issue.new_record? && User.current.allowed_to?(:add_issue_watchers, @project) -%>
<p><label><%= l(:label_issue_watchers) %></label> <p><label><%= l(:label_issue_watchers) %></label>
<% @issue.project.users.sort.each do |user| -%> <% @issue.project.users.sort.each do |user| -%>
<label class="floating"><%= check_box_tag 'issue[watcher_user_ids][]', user.id, @issue.watcher_user_ids.include?(user.id) %> <%=h user %></label> <label class="floating"><%= check_box_tag 'issue[watcher_user_ids][]', user.id, @issue.watched_by?(user) %> <%=h user %></label>
<% end -%> <% end -%>
</p> </p>
<% end %> <% end %>

5
vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb vendored
View File

@ -46,10 +46,9 @@ module Redmine
watching ? add_watcher(user) : remove_watcher(user) watching ? add_watcher(user) : remove_watcher(user)
end end
# Returns if object is watched by user # Returns true if object is watched by user
def watched_by?(user) def watched_by?(user)
!self.watchers.find(:first, !!(user && self.watchers.detect {|w| w.user_id == user.id })
:conditions => ["#{Watcher.table_name}.user_id = ?", user.id]).nil?
end end
# Returns an array of watchers' email addresses # Returns an array of watchers' email addresses