##// END OF EJS Templates
jro_apps » redmine
RSS
Removes RJS from MembersController....
Jean-Philippe Lang -
r9875:d3bfbb800c2b
parent child
Show More
Side by Side Unified
Context file:
r9875:d3bfbb800c2b Loading diff...:
Show file before | Show file after | Hide comments
@@ -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 %>
Show file before | Show file after | Hide comments
@@ -0,0 +1,2
1 Element.update('tab-content-members', '<%= escape_javascript(render :partial => 'projects/settings/members') %>');
2 hideOnLoad();
Show file before | Show file after | Hide comments
@@ -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 %>");
Show file before | Show file after | Hide comments
@@ -1,144 +1,118
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2012 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 class MembersController < ApplicationController
19 19 model_object Member
20 20 before_filter :find_model_object, :except => [:index, :create, :autocomplete]
21 21 before_filter :find_project_from_association, :except => [:index, :create, :autocomplete]
22 22 before_filter :find_project_by_project_id, :only => [:index, :create, :autocomplete]
23 23 before_filter :authorize
24 24 accept_api_auth :index, :show, :create, :update, :destroy
25 25
26 26 def index
27 27 @offset, @limit = api_offset_and_limit
28 28 @member_count = @project.member_principals.count
29 29 @member_pages = Paginator.new self, @member_count, @limit, params['page']
30 30 @offset ||= @member_pages.current.offset
31 31 @members = @project.member_principals.all(
32 32 :order => "#{Member.table_name}.id",
33 33 :limit => @limit,
34 34 :offset => @offset
35 35 )
36 36
37 37 respond_to do |format|
38 38 format.html { head 406 }
39 39 format.api
40 40 end
41 41 end
42 42
43 43 def show
44 44 respond_to do |format|
45 45 format.html { head 406 }
46 46 format.api
47 47 end
48 48 end
49 49
50 50 def create
51 51 members = []
52 52 if params[:membership]
53 53 if params[:membership][:user_ids]
54 54 attrs = params[:membership].dup
55 55 user_ids = attrs.delete(:user_ids)
56 56 user_ids.each do |user_id|
57 57 members << Member.new(:role_ids => params[:membership][:role_ids], :user_id => user_id)
58 58 end
59 59 else
60 60 members << Member.new(:role_ids => params[:membership][:role_ids], :user_id => params[:membership][:user_id])
61 61 end
62 62 @project.members << members
63 63 end
64 64
65 65 respond_to do |format|
66 if members.present? && members.all? {|m| m.valid? }
67 format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
68 format.js {
69 render(:update) {|page|
70 page.replace_html "tab-content-members", :partial => 'projects/settings/members'
71 page << 'hideOnLoad()'
72 members.each {|member| page.visual_effect(:highlight, "member-#{member.id}") }
73 }
74 }
75 format.api {
76 @member = members.first
66 format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
67 format.js { @members = members }
68 format.api {
69 @member = members.first
70 if @member.valid?
77 71 render :action => 'show', :status => :created, :location => membership_url(@member)
78 }
79 else
80 format.js {
81 render(:update) {|page|
82 errors = members.collect {|m|
83 m.errors.full_messages
84 }.flatten.uniq
85
86 page.alert(l(:notice_failed_to_save_members, :errors => errors.join(', ')))
87 }
88 }
89 format.api { render_validation_errors(members.first) }
90 end
72 else
73 render_validation_errors(@member)
74 end
75 }
91 76 end
92 77 end
93 78
94 79 def update
95 80 if params[:membership]
96 81 @member.role_ids = params[:membership][:role_ids]
97 82 end
98 83 saved = @member.save
99 84 respond_to do |format|
100 85 format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
101 format.js {
102 render(:update) {|page|
103 page.replace_html "tab-content-members", :partial => 'projects/settings/members'
104 page << 'hideOnLoad()'
105 page.visual_effect(:highlight, "member-#{@member.id}")
106 }
107 }
86 format.js
108 87 format.api {
109 88 if saved
110 89 render_api_ok
111 90 else
112 91 render_validation_errors(@member)
113 92 end
114 93 }
115 94 end
116 95 end
117 96
118 97 def destroy
119 98 if request.delete? && @member.deletable?
120 99 @member.destroy
121 100 end
122 101 respond_to do |format|
123 102 format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
124 format.js { render(:update) {|page|
125 page.replace_html "tab-content-members", :partial => 'projects/settings/members'
126 page << 'hideOnLoad()'
127 }
128 }
103 format.js
129 104 format.api {
130 105 if @member.destroyed?
131 106 render_api_ok
132 107 else
133 108 head :unprocessable_entity
134 109 end
135 110 }
136 111 end
137 112 end
138 113
139 114 def autocomplete
140 115 @principals = Principal.active.not_member_of(@project).like(params[:q]).all(:limit => 100)
141 116 render :layout => false
142 117 end
143
144 118 end
Show file before | Show file after | Hide comments
@@ -1,110 +1,122
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2012 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 require File.expand_path('../../test_helper', __FILE__)
19 19 require 'members_controller'
20 20
21 21 # Re-raise errors caught by the controller.
22 22 class MembersController; def rescue_action(e) raise e end; end
23 23
24 24
25 25 class MembersControllerTest < ActionController::TestCase
26 26 fixtures :projects, :members, :member_roles, :roles, :users
27 27
28 28 def setup
29 29 @controller = MembersController.new
30 30 @request = ActionController::TestRequest.new
31 31 @response = ActionController::TestResponse.new
32 32 User.current = nil
33 33 @request.session[:user_id] = 2
34 34 end
35 35
36 36 def test_create
37 37 assert_difference 'Member.count' do
38 38 post :create, :project_id => 1, :membership => {:role_ids => [1], :user_id => 7}
39 39 end
40 40 assert_redirected_to '/projects/ecookbook/settings/members'
41 41 assert User.find(7).member_of?(Project.find(1))
42 42 end
43 43
44 44 def test_create_multiple
45 45 assert_difference 'Member.count', 3 do
46 46 post :create, :project_id => 1, :membership => {:role_ids => [1], :user_ids => [7, 8, 9]}
47 47 end
48 48 assert_redirected_to '/projects/ecookbook/settings/members'
49 49 assert User.find(7).member_of?(Project.find(1))
50 50 end
51 51
52 52 def test_xhr_create
53 53 assert_difference 'Member.count', 3 do
54 post :create, :project_id => 1, :membership => {:role_ids => [1], :user_ids => [7, 8, 9]}, :format => "js"
54 xhr :post, :create, :project_id => 1, :membership => {:role_ids => [1], :user_ids => [7, 8, 9]}
55 assert_response :success
56 assert_template 'create'
57 assert_equal 'text/javascript', response.content_type
55 58 end
56 assert_select_rjs :replace_html, 'tab-content-members'
57 59 assert User.find(7).member_of?(Project.find(1))
58 60 assert User.find(8).member_of?(Project.find(1))
59 61 assert User.find(9).member_of?(Project.find(1))
62 assert_include 'tab-content-members', response.body
60 63 end
61 64
62 65 def test_xhr_create_with_failure
63 66 assert_no_difference 'Member.count' do
64 post :create, :project_id => 1, :membership => {:role_ids => [], :user_ids => [7, 8, 9]}, :format => "js"
67 xhr :post, :create, :project_id => 1, :membership => {:role_ids => [], :user_ids => [7, 8, 9]}
68 assert_response :success
69 assert_template 'create'
70 assert_equal 'text/javascript', response.content_type
65 71 end
66 assert_select '#tab-content-members', 0
67 assert @response.body.match(/alert/i), "Alert message not sent"
72 assert_match /alert/, response.body, "Alert message not sent"
68 73 end
69 74
70 75 def test_edit
71 76 assert_no_difference 'Member.count' do
72 77 put :update, :id => 2, :membership => {:role_ids => [1], :user_id => 3}
73 78 end
74 79 assert_redirected_to '/projects/ecookbook/settings/members'
75 80 end
76 81
77 82 def test_xhr_edit
78 83 assert_no_difference 'Member.count' do
79 84 xhr :put, :update, :id => 2, :membership => {:role_ids => [1], :user_id => 3}
85 assert_response :success
86 assert_template 'update'
87 assert_equal 'text/javascript', response.content_type
80 88 end
81 assert_select_rjs :replace_html, 'tab-content-members'
82 89 member = Member.find(2)
83 90 assert_equal [1], member.role_ids
84 91 assert_equal 3, member.user_id
92 assert_include 'tab-content-members', response.body
85 93 end
86 94
87 95 def test_destroy
88 96 assert_difference 'Member.count', -1 do
89 97 delete :destroy, :id => 2
90 98 end
91 99 assert_redirected_to '/projects/ecookbook/settings/members'
92 100 assert !User.find(3).member_of?(Project.find(1))
93 101 end
94 102
95 103 def test_xhr_destroy
96 104 assert_difference 'Member.count', -1 do
97 105 xhr :delete, :destroy, :id => 2
106 assert_response :success
107 assert_template 'destroy'
108 assert_equal 'text/javascript', response.content_type
98 109 end
99 assert_select_rjs :replace_html, 'tab-content-members'
110 assert_nil Member.find_by_id(2)
111 assert_include 'tab-content-members', response.body
100 112 end
101 113
102 114 def test_autocomplete
103 115 get :autocomplete, :project_id => 1, :q => 'mis'
104 116 assert_response :success
105 117 assert_template 'autocomplete'
106 118
107 119 assert_tag :label, :content => /User Misc/,
108 120 :child => { :tag => 'input', :attributes => { :name => 'membership[user_ids][]', :value => '8' } }
109 121 end
110 122 end
General Comments 0
You need to be logged in to leave comments. Login now