jro_apps/redmine Commit - r9864:38060a2cf013

Removes RJS from WatchersController....

Jean-Philippe Lang -

r9864:38060a2cf013

parent child

Context file:

r9864:38060a2cf013

Collapse all files

app/views/watchers/_set_watcher.js.erb created 644 +2 0

@@ -0,0 +1,2
	1	<% selector = ".#{watcher_css(watched)}" %>
	2	$$("<%= selector %>").each(function(el){el.update("<%= escape_javascript watcher_link(watched, user) %>")});

app/views/watchers/append.js.erb created 644 +4 0

@@ -0,0 +1,4
	1	<% @users.each do \|user\| %>
	2	$$("#issue_watcher_user_ids_<%= user.id %>").each(function(el){el.remove();});
	3	<% end %>
	4	Element.insert('watchers_inputs', '<%= escape_javascript(watchers_checkboxes(nil, @users, true)) %>');

app/views/watchers/create.js.erb created 644 +2 0

@@ -0,0 +1,2
	1	Element.update('ajax-modal', '<%= escape_javascript(render(:partial => 'watchers/new', :locals => {:watched => @watched})) %>');
	2	Element.update('watchers', '<%= escape_javascript(render(:partial => 'watchers/watchers', :locals => {:watched => @watched})) %>');

app/views/watchers/destroy.js.erb created 644 +1 0

	@@ -0,0 +1,1
				1	Element.update('watchers', '<%= escape_javascript(render(:partial => 'watchers/watchers', :locals => {:watched => @watched})) %>');

app/views/watchers/new.js.erb created 644 +3 0

@@ -0,0 +1,3
	1	Element.update('ajax-modal', '<%= escape_javascript(render :partial => 'watchers/new', :locals => {:watched => @watched}) %>');
	2	showModal('ajax-modal', '400px');
	3	$('ajax-modal').addClassName('new-watcher');

app/controllers/watchers_controller.rb +4 -37

             # Redmine - project management software
             # Copyright (C) 2006-2012  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class WatchersController < ApplicationController
               before_filter :find_project
               before_filter :require_login, :check_project_privacy, :only => [:watch, :unwatch]
               before_filter :authorize, :only => [:new, :destroy]
               def watch
                 if @watched.respond_to?(:visible?) && !@watched.visible?(User.current)
                   render_403
                 else
                   set_watcher(User.current, true)
                 end
               end
               def unwatch
                 set_watcher(User.current, false)
               end
               def new
-                respond_to do |format|
-                  format.js do
-                    render :update do |page|
-                      page.replace_html 'ajax-modal', :partial => 'watchers/new', :locals => {:watched => @watched}
-                      page << "showModal('ajax-modal', '400px');"
-                      page << "$('ajax-modal').addClassName('new-watcher');"
-                    end
-                  end
-                end
               end
               def create
                 if params[:watcher].is_a?(Hash) && request.post?
                   user_ids = params[:watcher][:user_ids] || [params[:watcher][:user_id]]
                   user_ids.each do |user_id|
                     Watcher.create(:watchable => @watched, :user_id => user_id)
                   end
                 end
                 respond_to do |format|
                   format.html { redirect_to_referer_or {render :text => 'Watcher added.', :layout => true}}
-                  format.js do
+                  format.js
-                    render :update do |page|
-                      page.replace_html 'ajax-modal', :partial => 'watchers/new', :locals => {:watched => @watched}
-                      page.replace_html 'watchers', :partial => 'watchers/watchers', :locals => {:watched => @watched}
-                    end
-                  end
                 end
               end
               def append
                 if params[:watcher].is_a?(Hash)
                   user_ids = params[:watcher][:user_ids] || [params[:watcher][:user_id]]
-                  users = User.active.find_all_by_id(user_ids)
+                  @users = User.active.find_all_by_id(user_ids)
-                  respond_to do |format|
-                    format.js do
-                      render :update do |page|
-                        users.each do |user|
-                          page << %|$$("#issue_watcher_user_ids_#{user.id}").each(function(el){el.remove();});|
-                        end
-                        page.insert_html :bottom, 'watchers_inputs', :text => watchers_checkboxes(nil, users, true)
-                      end
-                    end
-                  end
                 end
               end
               def destroy
                 @watched.set_watcher(User.find(params[:user_id]), false) if request.post?
                 respond_to do |format|
                   format.html { redirect_to :back }
-                  format.js do
+                  format.js
-                    render :update do |page|
-                      page.replace_html 'watchers', :partial => 'watchers/watchers', :locals => {:watched => @watched}
-                    end
-                  end
                 end
               end
               def autocomplete_for_user
                 @users = User.active.like(params[:q]).find(:all, :limit => 100)
                 if @watched
                   @users -= @watched.watcher_users
                 end
                 render :layout => false
               end
             private
               def find_project
                 if params[:object_type] && params[:object_id]
                   klass = Object.const_get(params[:object_type].camelcase)
                   return false unless klass.respond_to?('watched_by')
                   @watched = klass.find(params[:object_id])
                   @project = @watched.project
                 elsif params[:project_id]
                   @project = Project.visible.find_by_param(params[:project_id])
                 end
               rescue
                 render_404
               end
               def set_watcher(user, watching)
                 @watched.set_watcher(user, watching)
                 respond_to do |format|
                   format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
-                  format.js do
+                  format.js { render :partial => 'set_watcher', :locals => {:user => user, :watched => @watched} }
-                    render(:update) do |page|
-                      c = watcher_css(@watched)
-                      page << %|$$(".#{c}").each(function(el){el.innerHTML="#{escape_javascript watcher_link(@watched, user)}"});|
-                    end
-                  end
                 end
               end
             end

test/functional/watchers_controller_test.rb +10 -12

             # Redmine - project management software
             # Copyright (C) 2006-2012  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             require 'watchers_controller'
             # Re-raise errors caught by the controller.
             class WatchersController; def rescue_action(e) raise e end; end
             class WatchersControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules,
                        :issues, :trackers, :projects_trackers, :issue_statuses, :enumerations, :watchers
               def setup
                 @controller = WatchersController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
               end
               def test_watch
                 @request.session[:user_id] = 3
                 assert_difference('Watcher.count') do
                   xhr :post, :watch, :object_type => 'issue', :object_id => '1'
                   assert_response :success
                   assert @response.body.include?('$$(".issue-1-watcher")')
                 end
                 assert Issue.find(1).watched_by?(User.find(3))
               end
               def test_watch_should_be_denied_without_permission
                 Role.find(2).remove_permission! :view_issues
                 @request.session[:user_id] = 3
                 assert_no_difference('Watcher.count') do
                   xhr :post, :watch, :object_type => 'issue', :object_id => '1'
                   assert_response 403
                 end
               end
               def test_watch_invalid_class_should_respond_with_404
                 @request.session[:user_id] = 3
                 assert_no_difference('Watcher.count') do
                   xhr :post, :watch, :object_type => 'foo', :object_id => '1'
                   assert_response 404
                 end
               end
               def test_watch_invalid_object_should_respond_with_404
                 @request.session[:user_id] = 3
                 assert_no_difference('Watcher.count') do
                   xhr :post, :watch, :object_type => 'issue', :object_id => '999'
                   assert_response 404
                 end
               end
               def test_unwatch
                 @request.session[:user_id] = 3
                 assert_difference('Watcher.count', -1) do
                   xhr :post, :unwatch, :object_type => 'issue', :object_id => '2'
                   assert_response :success
                   assert @response.body.include?('$$(".issue-2-watcher")')
                 end
                 assert !Issue.find(1).watched_by?(User.find(3))
               end
               def test_new
                 @request.session[:user_id] = 2
                 xhr :get, :new, :object_type => 'issue', :object_id => '2'
                 assert_response :success
-                assert_select_rjs :replace_html, 'ajax-modal'
+                assert_match /ajax-modal/, response.body
               end
               def test_new_for_new_record_with_id
                 @request.session[:user_id] = 2
                 xhr :get, :new, :project_id => 1
                 assert_response :success
                 assert_equal Project.find(1), assigns(:project)
-                assert_select_rjs :replace_html, 'ajax-modal'
+                assert_match /ajax-modal/, response.body
               end
               def test_new_for_new_record_with_identifier
                 @request.session[:user_id] = 2
                 xhr :get, :new, :project_id => 'ecookbook'
                 assert_response :success
                 assert_equal Project.find(1), assigns(:project)
-                assert_select_rjs :replace_html, 'ajax-modal'
+                assert_match /ajax-modal/, response.body
               end
               def test_create
                 @request.session[:user_id] = 2
                 assert_difference('Watcher.count') do
                   xhr :post, :create, :object_type => 'issue', :object_id => '2', :watcher => {:user_id => '4'}
                   assert_response :success
-                  assert_select_rjs :replace_html, 'watchers'
+                  assert_match /watchers/, response.body
-                  assert_select_rjs :replace_html, 'ajax-modal'
+                  assert_match /ajax-modal/, response.body
                 end
                 assert Issue.find(2).watched_by?(User.find(4))
               end
               def test_create_multiple
                 @request.session[:user_id] = 2
                 assert_difference('Watcher.count', 2) do
                   xhr :post, :create, :object_type => 'issue', :object_id => '2', :watcher => {:user_ids => ['4', '7']}
                   assert_response :success
-                  assert_select_rjs :replace_html, 'watchers'
+                  assert_match /watchers/, response.body
-                  assert_select_rjs :replace_html, 'ajax-modal'
+                  assert_match /ajax-modal/, response.body
                 end
                 assert Issue.find(2).watched_by?(User.find(4))
                 assert Issue.find(2).watched_by?(User.find(7))
               end
               def test_autocomplete_on_watchable_creation
                 xhr :get, :autocomplete_for_user, :q => 'mi'
                 assert_response :success
                 assert_select 'input', :count => 4
                 assert_select 'input[name=?][value=1]', 'watcher[user_ids][]'
                 assert_select 'input[name=?][value=2]', 'watcher[user_ids][]'
                 assert_select 'input[name=?][value=8]', 'watcher[user_ids][]'
                 assert_select 'input[name=?][value=9]', 'watcher[user_ids][]'
               end
               def test_autocomplete_on_watchable_update
                 xhr :get, :autocomplete_for_user, :q => 'mi', :object_id => '2' , :object_type => 'issue'
                 assert_response :success
                 assert_select 'input', :count => 3
                 assert_select 'input[name=?][value=2]', 'watcher[user_ids][]'
                 assert_select 'input[name=?][value=8]', 'watcher[user_ids][]'
                 assert_select 'input[name=?][value=9]', 'watcher[user_ids][]'
               end
               def test_append
                 @request.session[:user_id] = 2
                 assert_no_difference 'Watcher.count' do
                   xhr :post, :append, :watcher => {:user_ids => ['4', '7']}
                   assert_response :success
-                  assert_select_rjs :insert_html, 'watchers_inputs' do
+                  assert_include 'watchers_inputs', response.body
-                    assert_select 'input[name=?][value=4]', 'issue[watcher_user_ids][]'
+                  assert_include 'issue[watcher_user_ids][]', response.body
-                    assert_select 'input[name=?][value=7]', 'issue[watcher_user_ids][]'
-                  end
                 end
               end
               def test_remove_watcher
                 @request.session[:user_id] = 2
                 assert_difference('Watcher.count', -1) do
                   xhr :post, :destroy, :object_type => 'issue', :object_id => '2', :user_id => '3'
                   assert_response :success
-                  assert_select_rjs :replace_html, 'watchers'
+                  assert_match /watchers/, response.body
                 end
                 assert !Issue.find(2).watched_by?(User.find(3))
               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