jro_apps/redmine Commit - r9861:21ee2e2cf246

Removes RJS from GroupsController....

Jean-Philippe Lang -

r9861:21ee2e2cf246

parent child

Context file:

r9861:21ee2e2cf246

Collapse all files

app/views/groups/add_users.js.erb created 644 +4 0

@@ -0,0 +1,4
	1	Element.update('tab-content-users', '<%= escape_javascript(render :partial => 'groups/users') %>');
	2	<% @users.each do \|user\| %>
	3	new Effect.Highlight('user-<%= user.id %>');
	4	<% end %>

app/views/groups/destroy_membership.js.erb created 644 +1 0

	@@ -0,0 +1,1
				1	Element.update('tab-content-memberships', '<%= escape_javascript(render :partial => 'groups/memberships') %>');

app/views/groups/edit_membership.js.erb created 644 +6 0

@@ -0,0 +1,6
	1	<% if @membership.valid? %>
	2	Element.update('tab-content-memberships', '<%= escape_javascript(render :partial => 'groups/memberships') %>');
	3	new Effect.Highlight('member-<%= @membership.id %>');
	4	<% else %>
	5	alert('<%= escape_javascript(l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', '))) %>');
	6	<% end %>

app/views/groups/remove_user.js.erb created 644 +1 0

	@@ -0,0 +1,1
				1	Element.update('tab-content-users', '<%= escape_javascript(render :partial => 'groups/users') %>');

app/controllers/groups_controller.rb +7 -25

               end
               def add_users
-                users = User.find_all_by_id(params[:user_id] || params[:user_ids])
+                @users = User.find_all_by_id(params[:user_id] || params[:user_ids])
-                @group.users << users if request.post?
+                @group.users << @users if request.post?
                 respond_to do |format|
                   format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'users' }
-                  format.js {
+                  format.js
-                    render(:update) {|page|
-                      page.replace_html "tab-content-users", :partial => 'groups/users'
-                      users.each {|user| page.visual_effect(:highlight, "user-#{user.id}") }
                   format.api { render_api_ok }
                 end
               end
                 @group.users.delete(User.find(params[:user_id])) if request.delete?
                 respond_to do |format|
                   format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'users' }
-                  format.js { render(:update) {|page| page.replace_html "tab-content-users", :partial => 'groups/users'} }
+                  format.js
                   format.api { render_api_ok }
                 end
               end
                 @membership = Member.edit_membership(params[:membership_id], params[:membership], @group)
                 @membership.save if request.post?
                 respond_to do |format|
-                  if @membership.valid?
+                  format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'memberships' }
-                    format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'memberships' }
+                  format.js
-                    format.js {
-                      render(:update) {|page|
-                        page.replace_html "tab-content-memberships", :partial => 'groups/memberships'
-                        page.visual_effect(:highlight, "member-#{@membership.id}")
-                  else
-                    format.js {
-                      render(:update) {|page|
-                        page.alert(l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')))
-                  end
                 end
               end
                 Member.find(params[:membership_id]).destroy if request.post?
                 respond_to do |format|
                   format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'memberships' }
-                  format.js { render(:update) {|page| page.replace_html "tab-content-memberships", :partial => 'groups/memberships'} }
+                  format.js
                 end
               end

test/functional/groups_controller_test.rb +27 -5

               def test_xhr_add_users
                 assert_difference 'Group.find(10).users.count', 2 do
                   xhr :post, :add_users, :id => 10, :user_ids => ['2', '3']
+                  assert_response :success
+                  assert_template 'add_users'
+                  assert_equal 'text/javascript', response.content_type
                 end
-                assert_select_rjs :replace_html, 'tab-content-users'
+                assert_match /John Smith/, response.body
               end
               def test_remove_user
               def test_xhr_remove_user
                 assert_difference 'Group.find(10).users.count', -1 do
                   xhr :delete, :remove_user, :id => 10, :user_id => '8'
+                  assert_response :success
+                  assert_template 'remove_user'
+                  assert_equal 'text/javascript', response.content_type
                 end
-                assert_select_rjs :replace_html, 'tab-content-users'
               end
               def test_new_membership
               def test_xhr_new_membership
                 assert_difference 'Group.find(10).members.count' do
                   xhr :post, :edit_membership, :id => 10, :membership => { :project_id => 2, :role_ids => ['1', '2']}
+                  assert_response :success
+                  assert_template 'edit_membership'
+                  assert_equal 'text/javascript', response.content_type
                 end
-                assert_select_rjs :replace_html, 'tab-content-memberships'
+                assert_match /OnlineStore/, response.body
               end
               def test_xhr_new_membership_with_failure
                 assert_no_difference 'Group.find(10).members.count' do
                   xhr :post, :edit_membership, :id => 10, :membership => { :project_id => 999, :role_ids => ['1', '2']}
+                  assert_response :success
+                  assert_template 'edit_membership'
+                  assert_equal 'text/javascript', response.content_type
                 end
-                assert @response.body.match(/alert/i), "Alert message not sent"
+                assert_match /alert/, response.body, "Alert message not sent"
               end
               def test_edit_membership
                 end
               end
+              def test_xhr_edit_membership
+                assert_no_difference 'Group.find(10).members.count' do
+                  xhr :post, :edit_membership, :id => 10, :membership_id => 6, :membership => { :role_ids => ['1', '3']}
+                  assert_response :success
+                  assert_template 'edit_membership'
+                  assert_equal 'text/javascript', response.content_type
+                end
+              end
               def test_destroy_membership
                 assert_difference 'Group.find(10).members.count', -1 do
                   post :destroy_membership, :id => 10, :membership_id => 6
               def test_xhr_destroy_membership
                 assert_difference 'Group.find(10).members.count', -1 do
                   xhr :post, :destroy_membership, :id => 10, :membership_id => 6
+                  assert_response :success
+                  assert_template 'destroy_membership'
+                  assert_equal 'text/javascript', response.content_type
                 end
-                assert_select_rjs :replace_html, 'tab-content-memberships'
               end
               def test_autocomplete_for_user

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