jro_apps/redmine Commit - r1711:a332e0a4febe

0

app/views/watchers/_watchers.rhtml created 644 +25 0

@@ -0,0 +1,25
	1	<div class="contextual">
	2	<%= link_to_remote l(:button_add),
	3	:url => {:controller => 'watchers',
	4	:action => 'new',
	5	:object_type => watched.class.name.underscore,
	6	:object_id => watched} if User.current.allowed_to?(:add_issue_watchers, @project) %>
	7	</div>
	8
	9	<p><strong><%= l(:label_issue_watchers) %></strong></p>
	10	<%= watchers_list(watched) %>
	11
	12	<% unless @watcher.nil? %>
	13	<% remote_form_for(:watcher, @watcher,
	14	:url => {:controller => 'watchers',
	15	:action => 'new',
	16	:object_type => watched.class.name.underscore,
	17	:object_id => watched},
	18	:method => :post,
	19	:html => {:id => 'new-watcher-form'}) do \|f\| %>
	20	<p><%= f.select :user_id, (watched.addable_watcher_users.collect {\|m\| [m.name, m.id]}), :prompt => true %>
	21
	22	<%= submit_tag l(:button_add) %>
	23	<%= toggle_link l(:button_cancel), 'new-watcher-form'%></p>
	24	<% end %>
	25	<% end %>

0

test/fixtures/watchers.yml created 644 +6 0

@@ -0,0 +1,6
	1	---
	2	watchers_001:
	3	watchable_type: Issue
	4	watchable_id: 2
	5	user_id: 3
	6	No newline at end of file

0

test/functional/watchers_controller_test.rb created 644 +70 0

@@ -0,0 +1,70
	1	# Redmine - project management software
	2	# Copyright (C) 2006-2008 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.dirname(__FILE__) + '/../test_helper'
	19	require 'watchers_controller'
	20
	21	# Re-raise errors caught by the controller.
	22	class WatchersController; def rescue_action(e) raise e end; end
	23
	24	class WatchersControllerTest < Test::Unit::TestCase
	25	fixtures :projects, :users, :roles, :members, :enabled_modules,
	26	:issues, :trackers, :projects_trackers, :issue_statuses, :enumerations, :watchers
	27
	28	def setup
	29	@controller = WatchersController.new
	30	@request = ActionController::TestRequest.new
	31	@response = ActionController::TestResponse.new
	32	User.current = nil
	33	end
	34
	35	def test_get_watch_should_be_invalid
	36	@request.session[:user_id] = 3
	37	get :watch, :object_type => 'issue', :object_id => '1'
	38	assert_response 405
	39	end
	40
	41	def test_watch
	42	@request.session[:user_id] = 3
	43	assert_difference('Watcher.count') do
	44	xhr :post, :watch, :object_type => 'issue', :object_id => '1'
	45	assert_response :success
	46	assert_select_rjs :replace_html, 'watcher'
	47	end
	48	assert Issue.find(1).watched_by?(User.find(3))
	49	end
	50
	51	def test_unwatch
	52	@request.session[:user_id] = 3
	53	assert_difference('Watcher.count', -1) do
	54	xhr :post, :unwatch, :object_type => 'issue', :object_id => '2'
	55	assert_response :success
	56	assert_select_rjs :replace_html, 'watcher'
	57	end
	58	assert !Issue.find(1).watched_by?(User.find(3))
	59	end
	60
	61	def test_new_watcher
	62	@request.session[:user_id] = 2
	63	assert_difference('Watcher.count') do
	64	xhr :post, :new, :object_type => 'issue', :object_id => '2', :watcher => {:user_id => '4'}
	65	assert_response :success
	66	assert_select_rjs :replace_html, 'watchers'
	67	end
	68	assert Issue.find(2).watched_by?(User.find(4))
	69	end
	70	end

0

app/controllers/watchers_controller.rb +35 -17

@@ -17,30 +17,38
17		17
18	class WatchersController < ApplicationController	18	class WatchersController < ApplicationController
19	layout 'base'	19	layout 'base'
20	before_filter :require_login, :find_project, :check_project_privacy	20	before_filter :find_project
		21	before_filter :require_login, :check_project_privacy, :only => [:watch, :unwatch]
		22	before_filter :authorize, :only => :new
21		23
22	def add	24	verify :method => :post,
23	user = User.current	25	:only => [ :watch, :unwatch ],
24	@watched.add_watcher(user)	26	:render => { :nothing => true, :status => :method_not_allowed }
25	respond_to do \|format\|	27
26	format.html { redirect_to :back }	28	def watch
27	format.js { render(:update) {\|page\| page.replace_html 'watcher', watcher_link(@watched, user)} }	29	set_watcher(User.current, true)
28	end	30	end
29	rescue RedirectBackError	31
30	render :text => 'Watcher added.', :layout => true	32	def unwatch
		33	set_watcher(User.current, false)
31	end	34	end
32		35
33	def ~~remove~~	36	def new
34	user = User.current	37	@watcher = Watcher.new(params[:watcher])
35	@watched.remove_watcher(user)	38	@watcher.watchable = @watched
		39	@watcher.save if request.post?
36	respond_to do \|format\|	40	respond_to do \|format\|
37	format.html { redirect_to :back }	41	format.html { redirect_to :back }
38	format.js { render(:update) {\|page\| page.replace_html 'watcher', watcher_link(@watched, user)} }	42	format.js do
		43	render :update do \|page\|
		44	page.replace_html 'watchers', :partial => 'watchers/watchers', :locals => {:watched => @watched}
		45	end
		46	end
39	end	47	end
40	rescue RedirectBackError	48	rescue ::ActionController::RedirectBackError
41	render :text => 'Watcher ~~remov~~ed.', :layout => true	49	render :text => 'Watcher added.', :layout => true
42	end	50	end
43		51
44	private	52	private
45	def find_project	53	def find_project
46	klass = Object.const_get(params[:object_type].camelcase)	54	klass = Object.const_get(params[:object_type].camelcase)
@@ -50,4 +58,14 private
50	rescue	58	rescue
51	render_404	59	render_404
52	end	60	end
		61
		62	def set_watcher(user, watching)
		63	@watched.set_watcher(user, watching)
		64	respond_to do \|format\|
		65	format.html { redirect_to :back }
		66	format.js { render(:update) {\|page\| page.replace_html 'watcher', watcher_link(@watched, user)} }
		67	end
		68	rescue ::ActionController::RedirectBackError
		69	render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true
		70	end
53	end	71	end

0

app/helpers/watchers_helper.rb +6 -1

                 return '' unless user && user.logged? && object.respond_to?('watched_by?')
                 watched = object.watched_by?(user)
                 url = {:controller => 'watchers',
-                       :action => (watched ? 'remove' : 'add'),
+                       :action => (watched ? 'unwatch' : 'watch'),
                        :object_type => object.class.to_s.underscore,
                        :object_id => object.id}
                 link_to_remote((watched ? l(:button_unwatch) : l(:button_watch)),
                                :class => (watched ? 'icon icon-fav' : 'icon icon-fav-off'))
               end
+              # Returns a comma separated list of users watching the given object
+              def watchers_list(object)
+                object.watcher_users.collect {|u| content_tag('span', link_to_user(u), :class => 'user') }.join(",\n")
+              end
             end

0

app/models/watcher.rb +7 0

@@ -19,5 +19,12 class Watcher < ActiveRecord::Base
19	belongs_to :watchable, :polymorphic => true	19	belongs_to :watchable, :polymorphic => true
20	belongs_to :user	20	belongs_to :user
21		21
		22	validates_presence_of :user
22	validates_uniqueness_of :user_id, :scope => [:watchable_type, :watchable_id]	23	validates_uniqueness_of :user_id, :scope => [:watchable_type, :watchable_id]
		24
		25	protected
		26
		27	def validate
		28	errors.add :user_id, :activerecord_error_invalid unless user.nil? \|\| user.active?
		29	end
23	end	30	end

0

app/views/issues/show.rhtml +8 0

             </div>
             <% end %>
+            <% if User.current.allowed_to?(:add_issue_watchers, @project) ||
+                    (@issue.watchers.any? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
+            <hr />
+            <div id="watchers">
+            <%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
+            </div>
+            <% end %>
             </div>
             <% if @issue.changesets.any? && User.current.allowed_to?(:view_changesets, @project) %>

0

lang/bg.yml +1 0

             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lang/cs.yml +1 0

             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lang/da.yml +1 0

             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lang/de.yml +1 0

             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lang/en.yml +1 0

             label_planning: Planning
             label_incoming_emails: Incoming emails
             label_generate_key: Generate a key
+            label_issue_watchers: Watchers
             button_login: Login
             button_submit: Submit

0

lang/es.yml +1 0

             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lang/fi.yml +1 0

             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lang/fr.yml +1 0

             label_planning: Planning
             label_incoming_emails: Emails entrants
             label_generate_key: Générer une clé
+            label_issue_watchers: Utilisateurs surveillant cette demande
             button_login: Connexion
             button_submit: Soumettre

0

lang/he.yml +1 0

             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lang/hu.yml +1 0

             setting_mail_handler_api_key: API kulcs
             text_email_delivery_not_configured: "Az E-mail küldés nincs konfigurálva, és az értesítések ki vannak kapcsolva.\nÁllítsd be az SMTP szervert a config/email.yml fájlban és indítsd újra az alkalmazást, hogy érvénybe lépjen."
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lang/it.yml +1 0

             setting_mail_handler_api_key: chiave API
             text_email_delivery_not_configured: "La consegna via e-mail non è configurata e le notifiche sono disabilitate.\nConfigura il tuo server SMTP in config/email.yml e riavvia l'applicazione per abilitarle."
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lang/ja.yml +1 0

             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lang/ko.yml +1 0

             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lang/lt.yml +1 0

             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lang/nl.yml +1 0

             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lang/no.yml +1 0

             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lang/pl.yml +1 0

             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lang/pt-br.yml +1 0

             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lang/pt.yml +1 0

             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lang/ro.yml +1 0

             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lang/ru.yml +1 0

             setting_mail_handler_api_key: API ключ
             text_email_delivery_not_configured: "Параметры работы с почтовым сервером не настроены и функция уведомления по email не активна.\nНастроить параметры для вашего SMTP сервера вы можете в файле config/email.yml. Для применения изменений перезапустите приложение."
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lang/sr.yml +1 0

             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lang/sv.yml +1 0

             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lang/th.yml +1 0

             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lang/uk.yml +1 0

             setting_mail_handler_api_key: API key
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lang/zh-tw.yml +1 0

             enumeration_doc_categories: 文件分類
             enumeration_activities: 活動 (時間追蹤)
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lang/zh.yml +1 0

             enumeration_activities: 活动（时间跟踪）
             text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
             field_parent_title: Parent page
+            label_issue_watchers: Watchers

0

lib/redmine.rb +3 0

                 # Gantt & calendar
                 map.permission :view_gantt, :projects => :gantt
                 map.permission :view_calendar, :projects => :calendar
+                # Watchers
+                map.permission :view_issue_watchers, {}
+                map.permission :add_issue_watchers, {:watchers => :new}
               end
               map.project_module :time_tracking do |map|

0

test/fixtures/roles.yml +4 0

                 - :add_issue_notes
                 - :move_issues
                 - :delete_issues
+                - :view_issue_watchers
+                - :add_issue_watchers
                 - :manage_public_queries
                 - :save_queries
                 - :view_gantt
                 - :add_issue_notes
                 - :move_issues
                 - :delete_issues
+                - :view_issue_watchers
                 - :save_queries
                 - :view_gantt
                 - :view_calendar
                 - :manage_issue_relations
                 - :add_issue_notes
                 - :move_issues
+                - :view_issue_watchers
                 - :save_queries
                 - :view_gantt
                 - :view_calendar

0

vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb +17 -1

                       class_eval do
                         has_many :watchers, :as => :watchable, :dependent => :delete_all
+                        has_many :watcher_users, :through => :watchers, :source => :user
                       end
                     end
                   end
                       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
                     def watched_by?(user)
                       !self.watchers.find(:first,
                                           :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,
                   end
                 end
               end
-            end 
  No newline at end of file
+            end

0

vendor/plugins/gloc-1.1.0/lib/gloc-rails-text.rb +2 -2

                   def add_options(option_tags, options, value = nil)
                     option_tags = "<option value=\"\"></option>\n" + option_tags if options[:include_blank]
-                    if value.blank? && options[:prompt]
+                    if options[:prompt]
-                      ("<option value=\"\">#{options[:prompt].kind_of?(String) ? options[:prompt] : l(:actionview_instancetag_blank_option)}</option>\n") + option_tags
+                      ("<option value=\"\">--- #{options[:prompt].kind_of?(String) ? options[:prompt] : l(:actionview_instancetag_blank_option)} ---</option>\n") + option_tags
                      else
                       option_tags
                     end

	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