jro_apps/redmine Commit - r3000:e5dc94fe82cb

Make use of #watched_by? in issue form....

Jean-Philippe Lang -

r3000:e5dc94fe82cb

parent child

Context file:

r3000:e5dc94fe82cb

Collapse all files

app/views/issues/_form.rhtml +1 -1

             <div id="issue_descr_fields" <%= 'style="display:none"' unless @issue.new_record? || @issue.errors.any? %>>
             <p><%= f.select :tracker_id, @project.trackers.collect {|t| [t.name, t.id]}, :required => true %></p>
             <%= observe_field :issue_tracker_id, :url => { :action => :update_form, :project_id => @project, :id => @issue },
                                                  :update => :attributes,
                                                  :with => "Form.serialize('issue-form')" %>
             <p><%= f.text_field :subject, :size => 80, :required => true %></p>
             <p><%= f.text_area :description,
                                :cols => 60,
                                :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
                                :accesskey => accesskey(:edit),
                                :class => 'wiki-edit' %></p>
             </div>
             <div id="attributes" class="attributes">
             	<%= render :partial => 'attributes' %>
             </div>
             <% if @issue.new_record? %>
             <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
             <% end %>
             <% if @issue.new_record? && User.current.allowed_to?(:add_issue_watchers, @project) -%>
             <p><label><%= l(:label_issue_watchers) %></label>
             <% @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 -%>
             </p>
             <% end %>
             <%= call_hook(:view_issues_form_details_bottom, { :issue => @issue, :form => f }) %>
             <%= wikitoolbar_for 'issue_description' %>

vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb +2 -3

             # ActsAsWatchable
             module Redmine
               module Acts
                 module Watchable
                   def self.included(base)
                     base.extend ClassMethods
                   end
                   module ClassMethods
                     def acts_as_watchable(options = {})
                       return if self.included_modules.include?(Redmine::Acts::Watchable::InstanceMethods)
                       send :include, Redmine::Acts::Watchable::InstanceMethods
                       class_eval do
                         has_many :watchers, :as => :watchable, :dependent => :delete_all
                         has_many :watcher_users, :through => :watchers, :source => :user
                         attr_protected :watcher_ids, :watcher_user_ids
                       end
                     end
                   end
                   module InstanceMethods
                     def self.included(base)
                       base.extend ClassMethods
                     end
                     # Returns an array of users that are proposed as watchers
                     def addable_watcher_users
                       self.project.users.sort - self.watcher_users
                     end
                     # Adds user as a watcher
                     def add_watcher(user)
                       self.watchers << Watcher.new(:user => user)
                     end
                     # Removes user from the watchers list
                     def remove_watcher(user)
                       return nil unless user && user.is_a?(User)
                       Watcher.delete_all "watchable_type = '#{self.class}' AND watchable_id = #{self.id} AND user_id = #{user.id}"
                     end
                     # Adds/removes watcher
                     def set_watcher(user, watching=true)
                       watching ? add_watcher(user) : remove_watcher(user)
                     end
-                    # Returns if object is watched by user
+                    # Returns true if object is 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
                     # Returns an array of watchers' email addresses
                     def watcher_recipients
                       self.watchers.collect { |w| w.user.mail if w.user.active? }.compact
                     end
                     module ClassMethods
                       # Returns the objects that are watched by user
                       def watched_by(user)
                         find(:all,
                              :include => :watchers,
                              :conditions => ["#{Watcher.table_name}.user_id = ?", user.id])
                       end
                     end
                   end
                 end
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages