jro_apps/redmine Commit - r10970:1257f1960ff6

0

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

	@@ -0,0 +1,1
				1	$('#users').html('<%= escape_javascript(render_principals_for_new_group_users(@group)) %>');

0

app/views/members/autocomplete.js.erb created 644 +1 0

	@@ -0,0 +1,1
				1	$('#principals_for_new_member').html('<%= escape_javascript(render_principals_for_new_members(@project)) %>');

0

app/controllers/groups_controller.rb +3 -2

               end
               def autocomplete_for_user
-                @users = User.active.not_in_group(@group).like(params[:q]).all(:limit => 100)
+                respond_to do |format|
-                render :layout => false
+                  format.js
+                end
               end
               def edit_membership

0

app/controllers/members_controller.rb +3 -2

               end
               def autocomplete
-                @principals = Principal.active.not_member_of(@project).like(params[:q]).all(:limit => 100)
+                respond_to do |format|
-                render :layout => false
+                  format.js
+                end
               end
               private

0

app/controllers/projects_controller.rb +1 0

               helper :repositories
               include RepositoriesHelper
               include ProjectsHelper
+              helper :members
               # Lists visible projects
               def index

0

app/helpers/groups_helper.rb +15 0

@@ -24,4 +24,19 module GroupsHelper
24	{:name => 'memberships', :partial => 'groups/memberships', :label => :label_project_plural}	24	{:name => 'memberships', :partial => 'groups/memberships', :label => :label_project_plural}
25	]	25	]
26	end	26	end
		27
		28	def render_principals_for_new_group_users(group)
		29	scope = User.active.not_in_group(group).like(params[:q])
		30	principal_count = scope.count
		31	principal_pages = Redmine::Pagination::Paginator.new principal_count, 100, params['page']
		32	principals = scope.offset(principal_pages.offset).limit(principal_pages.per_page).all
		33
		34	s = content_tag('div', principals_check_box_tags('user_ids[]', principals), :id => 'principals')
		35
		36	links = pagination_links_full(principal_pages, principal_count, :per_page_links => false) {\|text, parameters, options\|
		37	link_to text, autocomplete_for_user_group_path(group, parameters.merge(:q => params[:q], :format => 'js')), :remote => true
		38	}
		39
		40	s + content_tag('p', links, :class => 'pagination')
		41	end
27	end	42	end

0

app/helpers/members_helper.rb +14 0

@@ -18,4 +18,18
18	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.	18	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
19		19
20	module MembersHelper	20	module MembersHelper
		21	def render_principals_for_new_members(project)
		22	scope = Principal.active.not_member_of(project).like(params[:q]).order('type, login, lastname ASC')
		23	principal_count = scope.count
		24	principal_pages = Redmine::Pagination::Paginator.new principal_count, 100, params['page']
		25	principals = scope.offset(principal_pages.offset).limit(principal_pages.per_page).all
		26
		27	s = content_tag('div', principals_check_box_tags('membership[user_ids][]', principals), :id => 'principals')
		28
		29	links = pagination_links_full(principal_pages, principal_count, :per_page_links => false) {\|text, parameters, options\|
		30	link_to text, autocomplete_project_memberships_path(project, parameters.merge(:q => params[:q], :format => 'js')), :remote => true
		31	}
		32
		33	s + content_tag('p', links, :class => 'pagination')
		34	end
21	end	35	end

0

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

             </div>
             <div class="splitcontentright">
-            <% users = User.active.not_in_group(@group).all(:limit => 100) %>
-            <% if users.any? %>
               <%= form_for(@group, :remote => true, :url => group_users_path(@group),
                            :html => {:method => :post}) do |f| %>
                 <fieldset><legend><%=l(:label_user_new)%></legend>
                 <p><%= label_tag "user_search", l(:label_user_search) %><%= text_field_tag 'user_search', nil %></p>
-                <%= javascript_tag "observeSearchfield('user_search', 'users', '#{ escape_javascript autocomplete_for_user_group_path(@group) }')" %>
+                <%= javascript_tag "observeSearchfield('user_search', null, '#{ escape_javascript autocomplete_for_user_group_path(@group) }')" %>
                 <div id="users">
-                  <%= principals_check_box_tags 'user_ids[]', users %>
+                  <%= render_principals_for_new_group_users(@group) %>
                 </div>
                 <p><%= submit_tag l(:button_add) %></p>
                 </fieldset>
               <% end %>
-            <% end %>
             </div>

0

app/views/projects/settings/_members.html.erb +4 -6

             <% end %>
             </div>
-            <% principals = Principal.active.not_member_of(@project).all(:limit => 100, :order => 'type, login, lastname ASC') %>
             <div class="splitcontentright">
-            <% if roles.any? && principals.any? %>
+            <% if roles.any? %>
               <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
                 <fieldset><legend><%=l(:label_member_new)%></legend>
                 <p><%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %></p>
-                <%= javascript_tag "observeSearchfield('principal_search', 'principals', '#{ escape_javascript autocomplete_project_memberships_path(@project) }')" %>
+                <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js') }')" %>
-                <div id="principals">
+                <div id="principals_for_new_member">
-                  <%= principals_check_box_tags 'membership[user_ids][]', principals %>
+                  <%= render_principals_for_new_members(@project) %>
                 </div>
                 <p><%= l(:label_role_plural) %>:

0

public/javascripts/application.js +1 -1

                       url: url,
                       type: 'get',
                       data: {q: $this.val()},
-                      success: function(data){ $('#'+targetId).html(data); },
+                      success: function(data){ if(targetId) $('#'+targetId).html(data); },
                       beforeSend: function(){ $this.addClass('ajax-loading'); },
                       complete: function(){ $this.removeClass('ajax-loading'); }
                     });

0

public/stylesheets/application.css +1 -1

             div#tab-content-members fieldset, div#tab-content-memberships fieldset, div#tab-content-users fieldset { padding:1em; margin-bottom: 1em; }
             div#tab-content-members fieldset legend, div#tab-content-memberships fieldset legend, div#tab-content-users fieldset legend { font-weight: bold; }
             div#tab-content-members fieldset label, div#tab-content-memberships fieldset label, div#tab-content-users fieldset label { display: block; }
-            div#tab-content-members fieldset div, div#tab-content-users fieldset div { max-height: 400px; overflow:auto; }
+            div#tab-content-members #principals, div#tab-content-users #principals { max-height: 400px; overflow:auto; }
             #users_for_watcher {height: 200px; overflow:auto;}
             #users_for_watcher label {display: block;}

0

test/functional/groups_controller_test.rb +2 -5

               end
               def test_autocomplete_for_user
-                get :autocomplete_for_user, :id => 10, :q => 'mis'
+                get :autocomplete_for_user, :id => 10, :q => 'smi', :format => 'js'
                 assert_response :success
-                users = assigns(:users)
+                assert_include 'John Smith', response.body
-                assert_not_nil users
-                assert users.any?
-                assert !users.include?(Group.find(10).users.first)
               end
             end

0

test/functional/members_controller_test.rb +2 -5

               end
               def test_autocomplete
-                get :autocomplete, :project_id => 1, :q => 'mis'
+                get :autocomplete, :project_id => 1, :q => 'mis', :format => 'js'
                 assert_response :success
-                assert_template 'autocomplete'
+                assert_include 'User Misc', response.body
-                assert_tag :label, :content => /User Misc/,
-                                   :child => { :tag => 'input', :attributes => { :name => 'membership[user_ids][]', :value => '8' } }
               end
             end

0

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

                     { :controller => 'groups', :action => 'autocomplete_for_user', :id => '1' }
                   )
                 assert_routing(
+                    { :method => 'get', :path => "/groups/1/autocomplete_for_user.js" },
+                    { :controller => 'groups', :action => 'autocomplete_for_user', :id => '1', :format => 'js' }
+                  )
+                assert_routing(
                     { :method => 'get', :path => "/groups/1" },
                     { :controller => 'groups', :action => 'show', :id => '1' }
                   )

0

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

                     { :method => 'get', :path => "/projects/5234/memberships/autocomplete" },
                     { :controller => 'members', :action => 'autocomplete', :project_id => '5234' }
                   )
+                assert_routing(
+                    { :method => 'get', :path => "/projects/5234/memberships/autocomplete.js" },
+                    { :controller => 'members', :action => 'autocomplete', :project_id => '5234', :format => 'js' }
+                  )
               end
             end

0

app/views/groups/autocomplete_for_user.html.erb removed 0 -1

1

NO CONTENT: file was removed

0

app/views/members/autocomplete.html.erb removed 0 -1

1

NO CONTENT: file was removed

	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