jro_apps/redmine Commit - r527:bca5bd9c6276

Added watchers for message boards (watchers controller modified to support any watchable model)....

Jean-Philippe Lang -

r527:bca5bd9c6276

parent child

Context file:

r527:bca5bd9c6276

app/controllers/boards_controller.rb +2 0

               include MessagesHelper
               helper :sort
               include SortHelper
+              helper :watchers
+              include WatchersHelper
               def index
                 @boards = @project.boards

app/controllers/issues_controller.rb +2 0

               include IfpdfHelper
               helper :issue_relations
               include IssueRelationsHelper
+              helper :watchers
+              include WatchersHelper
               def show
                 @status_options = @issue.status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user

app/controllers/watchers_controller.rb +18 -7

@@ -20,19 +20,30 class WatchersController < ApplicationController
20	before_filter :require_login, :find_project, :check_project_privacy	20	before_filter :require_login, :find_project, :check_project_privacy
21		21
22	def add	22	def add
23	~~@issue~~.~~add_watcher~~(logged_in_user)	23	user = logged_in_user
24	redirect_to :controller => 'issues', :action => 'show', :id => @issue	24	@watched.add_watcher(user)
		25	respond_to do \|format\|
		26	format.html { render :text => 'Watcher added.', :layout => true }
		27	format.js { render(:update) {\|page\| page.replace_html 'watcher', watcher_link(@watched, user)} }
		28	end
25	end	29	end
26		30
27	def remove	31	def remove
28	~~@issue~~.~~remove_watcher~~(logged_in_user)	32	user = logged_in_user
29	redirect_to :controller => 'issues', :action => 'show', :id => @issue	33	@watched.remove_watcher(user)
		34	respond_to do \|format\|
		35	format.html { render :text => 'Watcher removed.', :layout => true }
		36	format.js { render(:update) {\|page\| page.replace_html 'watcher', watcher_link(@watched, user)} }
		37	end
30	end	38	end
31		39
32	private	40	private
33
34	def find_project	41	def find_project
35	@issue = Issue.find(params[:issue_id])	42	klass = Object.const_get(params[:object_type].camelcase)
36	@project = @issue.project	43	return false unless klass.respond_to?('watched_by')
		44	@watched = klass.find(params[:object_id])
		45	@project = @watched.project
		46	rescue
		47	render_404
37	end	48	end
38	end	49	end

app/helpers/watchers_helper.rb +17 0

@@ -16,4 +16,21
16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17		17
18	module WatchersHelper	18	module WatchersHelper
		19	def watcher_tag(object, user)
		20	content_tag("span", watcher_link(object, user), :id => 'watcher')
		21	end
		22
		23	def watcher_link(object, user)
		24	return '' unless user && object.respond_to?('watched_by?')
		25	watched = object.watched_by?(user)
		26	url = {:controller => 'watchers',
		27	:action => (watched ? 'remove' : 'add'),
		28	:object_type => object.class.to_s.underscore,
		29	:object_id => object.id}
		30	link_to_remote((watched ? l(:button_unwatch) : l(:button_watch)),
		31	{:url => url},
		32	:href => url_for(url),
		33	:class => (watched ? 'icon icon-fav' : 'icon icon-fav-off'))
		34
		35	end
19	end	36	end

app/models/board.rb +1 0

               has_many :messages, :dependent => :delete_all, :order => "#{Message.table_name}.created_on DESC"
               belongs_to :last_message, :class_name => 'Message', :foreign_key => :last_message_id
               acts_as_list :scope => :project_id
+              acts_as_watchable
               validates_presence_of :name, :description
               validates_length_of :name, :maximum => 30

app/views/boards/show.rhtml +1 0

             <div class="contextual">
             <%= link_to l(:label_message_new), {:controller => 'messages', :action => 'new', :board_id => @board}, :class => "icon icon-add" %>
+            <%= watcher_tag(@board, @logged_in_user) %>
             </div>
             <h2><%=h @board.name %></h2>

app/views/issues/show.rhtml +1 -7

             <div class="contextual">
             <%= link_to_if_authorized l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue}, :class => 'icon icon-edit' %>
             <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue}, :class => 'icon icon-time' %>
-            <% if @logged_in_user %>
+            <%= watcher_tag(@issue, @logged_in_user) %>
-              <% if @issue.watched_by?(@logged_in_user) %>
-            <%= link_to l(:button_unwatch), {:controller => 'watchers', :action => 'remove', :issue_id => @issue}, :class => 'icon icon-fav' %>
-              <% else %>
-            <%= link_to l(:button_watch), {:controller => 'watchers', :action => 'add', :issue_id => @issue}, :class => 'icon icon-fav-off' %>
-              <% end %>
-            <% end %>
             <%= link_to_if_authorized l(:button_move), {:controller => 'projects', :action => 'move_issues', :id => @project, "issue_ids[]" => @issue.id }, :class => 'icon icon-move' %>
             <%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
             </div>

General Comments 0

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

No TODOs yet

	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