jro_apps/redmine Commit - r13220:1508cd7b8bf9

app/views/groups/_new_users_form.html.erb created 644 +9 0

@@ -0,0 +1,9
	1	<fieldset class="box">
	2	<legend><%= label_tag "user_search", l(:label_user_search) %></legend>
	3	<p><%= text_field_tag 'user_search', nil %></p>
	4	<%= javascript_tag "observeSearchfield('user_search', null, '#{ escape_javascript autocomplete_for_user_group_path(@group) }')" %>
	5
	6	<div id="users">
	7	<%= render_principals_for_new_group_users(@group) %>
	8	</div>
	9	</fieldset>

app/views/groups/_new_users_modal.html.erb created 644 +9 0

@@ -0,0 +1,9
	1	<h3 class="title"><%= l(:label_user_new) %></h3>
	2
	3	<%= form_for(@group, :url => group_users_path(@group), :remote => true, :method => :post) do \|f\| %>
	4	<%= render :partial => 'new_users_form' %>
	5	<p class="buttons">
	6	<%= submit_tag l(:button_add) %>
	7	<%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
	8	</p>
	9	<% end %>

app/views/groups/new_users.html.erb created 644 +6 0

@@ -0,0 +1,6
	1	<h2><%= l(:label_user_new) %></h2>
	2
	3	<%= form_for(@group, :url => group_users_path(@group), :method => :post) do \|f\| %>
	4	<%= render :partial => 'new_users_form' %>
	5	<p><%= submit_tag l(:button_add) %></p>
	6	<% end %>

app/views/groups/new_users.js.erb created 644 +2 0

@@ -0,0 +1,2
	1	$('#ajax-modal').html('<%= escape_javascript(render :partial => 'groups/new_users_modal') %>');
	2	showModal('ajax-modal', '700px');

app/controllers/groups_controller.rb +3 0

                 end
               end
+              def new_users
+              end
               def add_users
                 @users = User.where(:id => (params[:user_id] || params[:user_ids])).to_a
                 @group.users << @users if request.post?

app/helpers/groups_helper.rb +4 -1

                 principal_pages = Redmine::Pagination::Paginator.new principal_count, 100, params['page']
                 principals = scope.offset(principal_pages.offset).limit(principal_pages.per_page).to_a
-                s = content_tag('div', principals_check_box_tags('user_ids[]', principals), :id => 'principals')
+                s = content_tag('div',
+                  content_tag('div', principals_check_box_tags('user_ids[]', principals), :id => 'principals'),
+                  :class => 'objects-selection'
+                )
                 links = pagination_links_full(principal_pages, principal_count, :per_page_links => false) {|text, parameters, options|
                   link_to text, autocomplete_for_user_group_path(group, parameters.merge(:q => params[:q], :format => 'js')), :remote => true

app/views/groups/_users.html.erb +2 -19

@@ -1,4 +1,5
1	<div class="splitcontentleft">	1	<p><%= link_to l(:label_user_new), new_group_users_path(@group), :remote => true, :class => "icon icon-add" %></p>
		2
2	<% if @group.users.any? %>	3	<% if @group.users.any? %>
3	<table class="list users">	4	<table class="list users">
4	<thead><tr>	5	<thead><tr>
@@ -19,21 +20,3
19	<% else %>	20	<% else %>
20	<p class="nodata"><%= l(:label_no_data) %></p>	21	<p class="nodata"><%= l(:label_no_data) %></p>
21	<% end %>	22	<% end %>
22	</div>
23
24	<div class="splitcontentright">
25	<%= form_for(@group, :remote => true, :url => group_users_path(@group),
26	:html => {:method => :post}) do \|f\| %>
27	<fieldset><legend><%=l(:label_user_new)%></legend>
28
29	<p><%= label_tag "user_search", l(:label_user_search) %><%= text_field_tag 'user_search', nil %></p>
30	<%= javascript_tag "observeSearchfield('user_search', null, '#{ escape_javascript autocomplete_for_user_group_path(@group) }')" %>
31
32	<div id="users">
33	<%= render_principals_for_new_group_users(@group) %>
34	</div>
35
36	<p><%= submit_tag l(:button_add) %></p>
37	</fieldset>
38	<% end %>
39	</div>

app/views/groups/add_users.js.erb +1 0

+            hideModal();
             $('#tab-content-users').html('<%= escape_javascript(render :partial => 'groups/users') %>');
             <% @users.each do |user| %>
               $('#user-<%= user.id %>').effect("highlight");

config/routes.rb +3 -2

                 end
               end
-              match 'groups/:id/users', :controller => 'groups', :action => 'add_users', :id => /\d+/, :via => :post, :as => 'group_users'
+              get 'groups/:id/users/new', :to => 'groups#new_users', :id => /\d+/, :as => 'new_group_users'
-              match 'groups/:id/users/:user_id', :controller => 'groups', :action => 'remove_user', :id => /\d+/, :via => :delete, :as => 'group_user'
+              post 'groups/:id/users', :to => 'groups#add_users', :id => /\d+/, :as => 'group_users'
+              delete 'groups/:id/users/:user_id', :to => 'groups#remove_user', :id => /\d+/, :as => 'group_user'
               resources :trackers, :except => :show do
                 collection do

test/functional/groups_controller_test.rb +12 0

@@ -113,6 +113,18 class GroupsControllerTest < ActionController::TestCase
113	assert_redirected_to '/groups'	113	assert_redirected_to '/groups'
114	end	114	end
115		115
		116	def test_new_users
		117	get :new_users, :id => 10
		118	assert_response :success
		119	assert_template 'new_users'
		120	end
		121
		122	def test_xhr_new_users
		123	xhr :get, :new_users, :id => 10
		124	assert_response :success
		125	assert_equal 'text/javascript', response.content_type
		126	end
		127
116	def test_add_users	128	def test_add_users
117	assert_difference 'Group.find(10).users.count', 2 do	129	assert_difference 'Group.find(10).users.count', 2 do
118	post :add_users, :id => 10, :user_ids => ['2', '3']	130	post :add_users, :id => 10, :user_ids => ['2', '3']

test/integration/routing/groups_test.rb +4 0

               def test_groups
                 assert_routing(
+                    { :method => 'get', :path => "/groups/567/users/new" },
+                    { :controller => 'groups', :action => 'new_users', :id => '567' }
+                  )
+                assert_routing(
                     { :method => 'post', :path => "/groups/567/users" },
                     { :controller => 'groups', :action => 'add_users', :id => '567' }
                   )

	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