jro_apps/redmine Commit - r2549:04e181b8b05d

Adds a user search field with autocompleter on project members screen....

Jean-Philippe Lang -

r2549:04e181b8b05d

parent child

Context file:

r2549:04e181b8b05d

Collapse all files

app/views/members/autocomplete_for_member_login.rhtml created 644 +5 0

@@ -0,0 +1,5
	1	<ul>
	2	<% @users.each do \|user\| -%>
	3	<li><%= h user.login %><span class="informal"> (<%= h(user.name(:lastname_coma_firstname)) %>)</span></li>
	4	<% end -%>
	5	</ul>

app/controllers/members_controller.rb +9 -2

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class MembersController < ApplicationController
-              before_filter :find_member, :except => :new
+              before_filter :find_member, :except => [:new, :autocomplete_for_member_login]
-              before_filter :find_project, :only => :new
+              before_filter :find_project, :only => [:new, :autocomplete_for_member_login]
               before_filter :authorize
               def new
                   format.js { render(:update) {|page| page.replace_html "tab-content-members", :partial => 'projects/settings/members'} }
                 end
               end
+              def autocomplete_for_member_login
+                @users = User.active.find(:all, :conditions => ["LOWER(login) LIKE ? OR LOWER(firstname) LIKE ? OR LOWER(lastname) LIKE ?", "#{params[:user]}%", "#{params[:user]}%", "#{params[:user]}%"],
+                                                :limit => 10,
+                                                :order => 'login ASC') - @project.users
+                render :layout => false
+              end
             private
               def find_project

app/models/member.rb +10 0

@@ -31,6 +31,16 class Member < ActiveRecord::Base
31	self.user.name	31	self.user.name
32	end	32	end
33		33
		34	# Sets user by login
		35	def user_login=(login)
		36	login = login.to_s
		37	unless login.blank?
		38	if (u = User.find_by_login(login))
		39	self.user = u
		40	end
		41	end
		42	end
		43
34	def <=>(member)	44	def <=>(member)
35	role == member.role ? (user <=> member.user) : (role <=> member.role)	45	role == member.role ? (user <=> member.user) : (role <=> member.role)
36	end	46	end

app/views/projects/settings/_members.rhtml +16 -9

             <%= error_messages_for 'member' %>
-            <% roles = Role.find_all_givable %>
+            <% roles = Role.find_all_givable
-            <% users = User.active.find(:all).sort - @project.users %>
-            <% # members sorted by role position
                members = @project.members.find(:all, :include => [:role, :user]).sort %>
             <div class="splitcontentleft">
             <% end %>
             </div>
+            <% users_count = User.active.count - @project.users.count
+               users = (users_count < 300) ? User.active.find(:all, :limit => 200).sort - @project.users : [] %>
             <div class="splitcontentright">
-            <% if !users.empty? %>
+            <% if roles.any? && users_count > 0 %>
               <% remote_form_for(:member, @member, :url => {:controller => 'members', :action => 'new', :id => @project}, :method => :post) do |f| %>
                 <fieldset><legend><%=l(:label_member_new)%></legend>
-            		<div>
+            		<p><%= text_field_tag 'member[user_login]', nil, :size => "40" %></p>
-            		<% users.each do |user| -%>
+            		<div id="member_user_login_choices" class="autocomplete">sqd</div>
-            		<label><%= check_box_tag 'member[user_ids][]', user.id, false %> <%= user %></label>
+            		<%= javascript_tag "new Ajax.Autocompleter('member_user_login', 'member_user_login_choices', '#{ url_for(:controller => 'members', :action => 'autocomplete_for_member_login', :id => @project) }', { minChars: 1, frequency: 0.5, paramName: 'user' });" %>
-            		<% end -%>
+            		<% unless users.empty? %>
-            		</div>
+            			<div>
+            			<% users.each do |user| -%>
+            			<label><%= check_box_tag 'member[user_ids][]', user.id, false %> <%= user %></label>
+            			<% end -%>
+            			</div>
+            		<% end %>
                 <p><%= l(:label_role) %>: <%= f.select :role_id, roles.collect{|role| [role.name, role.id]}, :selected => nil %>
                 <%= submit_tag l(:button_add) %></p>
             		</fieldset>

lib/redmine.rb +1 -1

               map.permission :search_project, {:search => :index}, :public => true
               map.permission :edit_project, {:projects => [:settings, :edit]}, :require => :member
               map.permission :select_project_modules, {:projects => :modules}, :require => :member
-              map.permission :manage_members, {:projects => :settings, :members => [:new, :edit, :destroy]}, :require => :member
+              map.permission :manage_members, {:projects => :settings, :members => [:new, :edit, :destroy, :autocomplete_for_member_login]}, :require => :member
               map.permission :manage_versions, {:projects => [:settings, :add_version], :versions => [:edit, :destroy]}, :require => :member
               map.project_module :issue_tracking do |map|

public/stylesheets/application.css +31 -1

@@ -327,7 +327,7 a.atom { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px
327	/* Project members tab */	327	/* Project members tab */
328	div#tab-content-members .splitcontentleft { width: 64% }	328	div#tab-content-members .splitcontentleft { width: 64% }
329	div#tab-content-members .splitcontentright { width: 34% }	329	div#tab-content-members .splitcontentright { width: 34% }
330	div#tab-content-members fieldset { ~~margin-top~~: -8px; ~~padding-top~~:~~0.6~~em; margin-bottom: 1em; }	330	div#tab-content-members fieldset { padding:1em; margin-bottom: 1em; }
331	div#tab-content-members fieldset legend { font-weight: bold; }	331	div#tab-content-members fieldset legend { font-weight: bold; }
332	div#tab-content-members fieldset label { display: block; }	332	div#tab-content-members fieldset label { display: block; }
333	div#tab-content-members fieldset div { max-height: 400px; overflow:auto; }	333	div#tab-content-members fieldset div { max-height: 400px; overflow:auto; }
@@ -486,6 +486,36 border-bottom: 1px solid #fff;
486	background-color: #fff;	486	background-color: #fff;
487	}	487	}
488		488
		489	/*** Auto-complete ***/
		490	div.autocomplete {
		491	position:absolute;
		492	width:250px;
		493	background-color:white;
		494	margin:0;
		495	padding:0;
		496	}
		497	div.autocomplete ul {
		498	list-style-type:none;
		499	margin:0;
		500	padding:0;
		501	}
		502	div.autocomplete ul li.selected { background-color: #ffb;}
		503	div.autocomplete ul li {
		504	list-style-type:none;
		505	display:block;
		506	margin:0;
		507	padding:2px;
		508	cursor:pointer;
		509	font-size: 90%;
		510	border-bottom: 1px solid #ccc;
		511	border-left: 1px solid #ccc;
		512	border-right: 1px solid #ccc;
		513	}
		514	div.autocomplete ul li span.informal {
		515	font-size: 80%;
		516	color: #aaa;
		517	}
		518
489	/*** Diff ***/	519	/*** Diff ***/
490	.diff_out { background: #fcc; }	520	.diff_out { background: #fcc; }
491	.diff_in { background: #cfc; }	521	.diff_in { background: #cfc; }

test/functional/members_controller_test.rb +16 0

@@ -48,6 +48,14 class MembersControllerTest < Test::Unit::TestCase
48	assert User.find(7).member_of?(Project.find(1))	48	assert User.find(7).member_of?(Project.find(1))
49	end	49	end
50		50
		51	def test_create_by_user_login
		52	assert_difference 'Member.count' do
		53	post :new, :id => 1, :member => {:role_id => 1, :user_login => 'someone'}
		54	end
		55	assert_redirected_to '/projects/ecookbook/settings/members'
		56	assert User.find(7).member_of?(Project.find(1))
		57	end
		58
51	def test_create_multiple	59	def test_create_multiple
52	assert_difference 'Member.count', 3 do	60	assert_difference 'Member.count', 3 do
53	post :new, :id => 1, :member => {:role_id => 1, :user_ids => [7, 8, 9]}	61	post :new, :id => 1, :member => {:role_id => 1, :user_ids => [7, 8, 9]}
@@ -70,4 +78,12 class MembersControllerTest < Test::Unit::TestCase
70	assert_redirected_to '/projects/ecookbook/settings/members'	78	assert_redirected_to '/projects/ecookbook/settings/members'
71	assert !User.find(3).member_of?(Project.find(1))	79	assert !User.find(3).member_of?(Project.find(1))
72	end	80	end
		81
		82	def test_autocomplete_for_member_login
		83	get :autocomplete_for_member_login, :id => 1, :user => 'mis'
		84	assert_response :success
		85	assert_template 'autocomplete_for_member_login'
		86
		87	assert_tag :ul, :child => {:tag => 'li', :content => /miscuser8/}
		88	end
73	end	89	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