jro_apps/redmine Commit - r9875:d3bfbb800c2b

Removes RJS from MembersController....

Jean-Philippe Lang -

r9875:d3bfbb800c2b

parent child

Context file:

r9875:d3bfbb800c2b

Collapse all files

app/views/members/create.js.erb created 644 +11 0

@@ -0,0 +1,11
	1	Element.update('tab-content-members', '<%= escape_javascript(render :partial => 'projects/settings/members') %>');
	2	hideOnLoad();
	3
	4	<% if @members.present? && @members.all? {\|m\| m.valid? } %>
	5	<% @members.each do \|member\| %>
	6	new Effect.Highlight("member-<%= member.id %>");
	7	<% end %>
	8	<% else %>
	9	<% errors = @members.collect {\|m\| m.errors.full_messages}.flatten.uniq.join(', ') %>
	10	alert('<%= escape_javascript l(:notice_failed_to_save_members, :errors => errors) %>');
	11	<% end %>

app/views/members/destroy.js.erb created 644 +2 0

@@ -0,0 +1,2
	1	Element.update('tab-content-members', '<%= escape_javascript(render :partial => 'projects/settings/members') %>');
	2	hideOnLoad();

app/views/members/update.js.erb created 644 +3 0

@@ -0,0 +1,3
	1	Element.update('tab-content-members', '<%= escape_javascript(render :partial => 'projects/settings/members') %>');
	2	hideOnLoad();
	3	new Effect.Highlight("member-<%= @member.id %>");

app/controllers/members_controller.rb +11 -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 MembersController < ApplicationController
               model_object Member
               before_filter :find_model_object, :except => [:index, :create, :autocomplete]
               before_filter :find_project_from_association, :except => [:index, :create, :autocomplete]
               before_filter :find_project_by_project_id, :only => [:index, :create, :autocomplete]
               before_filter :authorize
               accept_api_auth :index, :show, :create, :update, :destroy
               def index
                 @offset, @limit = api_offset_and_limit
                 @member_count = @project.member_principals.count
                 @member_pages = Paginator.new self, @member_count, @limit, params['page']
                 @offset ||= @member_pages.current.offset
                 @members =  @project.member_principals.all(
                   :order => "#{Member.table_name}.id",
                   :limit  =>  @limit,
                   :offset =>  @offset
                 )
                 respond_to do |format|
                   format.html { head 406 }
                   format.api
                 end
               end
               def show
                 respond_to do |format|
                   format.html { head 406 }
                   format.api
                 end
               end
               def create
                 members = []
                 if params[:membership]
                   if params[:membership][:user_ids]
                     attrs = params[:membership].dup
                     user_ids = attrs.delete(:user_ids)
                     user_ids.each do |user_id|
                       members << Member.new(:role_ids => params[:membership][:role_ids], :user_id => user_id)
                     end
                   else
                     members << Member.new(:role_ids => params[:membership][:role_ids], :user_id => params[:membership][:user_id])
                   end
                   @project.members << members
                 end
                 respond_to do |format|
-                  if members.present? && members.all? {|m| m.valid? }
+                  format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
-                    format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
+                  format.js { @members = members }
-                    format.js {
+                  format.api {
-                      render(:update) {|page|
+                    @member = members.first
-                        page.replace_html "tab-content-members", :partial => 'projects/settings/members'
+                    if @member.valid?
-                        page << 'hideOnLoad()'
-                        members.each {|member| page.visual_effect(:highlight, "member-#{member.id}") }
-                    format.api {
-                      @member = members.first
                       render :action => 'show', :status => :created, :location => membership_url(@member)
+                    else
-                  else
+                      render_validation_errors(@member)
-                    format.js {
+                    end
-                      render(:update) {|page|
-                        errors = members.collect {|m|
-                          m.errors.full_messages
-                        }.flatten.uniq
-                        page.alert(l(:notice_failed_to_save_members, :errors => errors.join(', ')))
-                    format.api { render_validation_errors(members.first) }
-                  end
                 end
               end
               def update
                 if params[:membership]
                   @member.role_ids = params[:membership][:role_ids]
                 end
                 saved = @member.save
                 respond_to do |format|
                   format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
-                  format.js {
+                  format.js
-                    render(:update) {|page|
-                      page.replace_html "tab-content-members", :partial => 'projects/settings/members'
-                      page << 'hideOnLoad()'
-                      page.visual_effect(:highlight, "member-#{@member.id}")
                   format.api {
                     if saved
                       render_api_ok
                     else
                       render_validation_errors(@member)
                     end
                   }
                 end
               end
               def destroy
                 if request.delete? && @member.deletable?
                   @member.destroy
                 end
                 respond_to do |format|
                   format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
-                  format.js { render(:update) {|page|
+                  format.js
-                      page.replace_html "tab-content-members", :partial => 'projects/settings/members'
-                      page << 'hideOnLoad()'
                   format.api {
                     if @member.destroyed?
                       render_api_ok
                     else
                       head :unprocessable_entity
                     end
                   }
                 end
               end
               def autocomplete
                 @principals = Principal.active.not_member_of(@project).like(params[:q]).all(:limit => 100)
                 render :layout => false
               end
             end

test/functional/members_controller_test.rb +19 -7

             # 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 'members_controller'
             # Re-raise errors caught by the controller.
             class MembersController; def rescue_action(e) raise e end; end
             class MembersControllerTest < ActionController::TestCase
               fixtures :projects, :members, :member_roles, :roles, :users
               def setup
                 @controller = MembersController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
                 @request.session[:user_id] = 2
               end
               def test_create
                 assert_difference 'Member.count' do
                   post :create, :project_id => 1, :membership => {:role_ids => [1], :user_id => 7}
                 end
                 assert_redirected_to '/projects/ecookbook/settings/members'
                 assert User.find(7).member_of?(Project.find(1))
               end
               def test_create_multiple
                 assert_difference 'Member.count', 3 do
                   post :create, :project_id => 1, :membership => {:role_ids => [1], :user_ids => [7, 8, 9]}
                 end
                 assert_redirected_to '/projects/ecookbook/settings/members'
                 assert User.find(7).member_of?(Project.find(1))
               end
               def test_xhr_create
                 assert_difference 'Member.count', 3 do
-                  post :create, :project_id => 1, :membership => {:role_ids => [1], :user_ids => [7, 8, 9]}, :format => "js"
+                  xhr :post, :create, :project_id => 1, :membership => {:role_ids => [1], :user_ids => [7, 8, 9]}
+                  assert_response :success
+                  assert_template 'create'
+                  assert_equal 'text/javascript', response.content_type
                 end
-                assert_select_rjs :replace_html, 'tab-content-members'
                 assert User.find(7).member_of?(Project.find(1))
                 assert User.find(8).member_of?(Project.find(1))
                 assert User.find(9).member_of?(Project.find(1))
+                assert_include 'tab-content-members', response.body
               end
               def test_xhr_create_with_failure
                 assert_no_difference 'Member.count' do
-                  post :create, :project_id => 1, :membership => {:role_ids => [], :user_ids => [7, 8, 9]}, :format => "js"
+                  xhr :post, :create, :project_id => 1, :membership => {:role_ids => [], :user_ids => [7, 8, 9]}
+                  assert_response :success
+                  assert_template 'create'
+                  assert_equal 'text/javascript', response.content_type
                 end
-                assert_select '#tab-content-members', 0
+                assert_match /alert/, response.body, "Alert message not sent"
-                assert @response.body.match(/alert/i), "Alert message not sent"
               end
               def test_edit
                 assert_no_difference 'Member.count' do
                   put :update, :id => 2, :membership => {:role_ids => [1], :user_id => 3}
                 end
                 assert_redirected_to '/projects/ecookbook/settings/members'
               end
               def test_xhr_edit
                 assert_no_difference 'Member.count' do
                   xhr :put, :update, :id => 2, :membership => {:role_ids => [1], :user_id => 3}
+                  assert_response :success
+                  assert_template 'update'
+                  assert_equal 'text/javascript', response.content_type
                 end
-                assert_select_rjs :replace_html, 'tab-content-members'
                 member = Member.find(2)
                 assert_equal [1], member.role_ids
                 assert_equal 3, member.user_id
+                assert_include 'tab-content-members', response.body
               end
               def test_destroy
                 assert_difference 'Member.count', -1 do
                   delete :destroy, :id => 2
                 end
                 assert_redirected_to '/projects/ecookbook/settings/members'
                 assert !User.find(3).member_of?(Project.find(1))
               end
               def test_xhr_destroy
                 assert_difference 'Member.count', -1 do
                   xhr :delete, :destroy, :id => 2
+                  assert_response :success
+                  assert_template 'destroy'
+                  assert_equal 'text/javascript', response.content_type
                 end
-                assert_select_rjs :replace_html, 'tab-content-members'
+                assert_nil Member.find_by_id(2)
+                assert_include 'tab-content-members', response.body
               end
               def test_autocomplete
                 get :autocomplete, :project_id => 1, :q => 'mis'
                 assert_response :success
                 assert_template 'autocomplete'
                 assert_tag :label, :content => /User Misc/,
                                    :child => { :tag => 'input', :attributes => { :name => 'membership[user_ids][]', :value => '8' } }
               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