jro_apps/redmine Commit - r9038:b24ad1f0bca4

Merged r9128 from trunk....

Jean-Philippe Lang -

r9038:b24ad1f0bca4

parent child

Context file:

r9038:b24ad1f0bca4

Collapse all files

app/controllers/members_controller.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2011  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 => [:new, :autocomplete_for_member]
               before_filter :find_project_from_association, :except => [:new, :autocomplete_for_member]
               before_filter :find_project, :only => [:new, :autocomplete_for_member]
               before_filter :authorize
               def new
                 members = []
                 if params[:member] && request.post?
                   attrs = params[:member].dup
                   if (user_ids = attrs.delete(:user_ids))
                     user_ids.each do |user_id|
                       members << Member.new(:role_ids => params[:member][:role_ids], :user_id => user_id)
                     end
                   else
                     members << Member.new(:role_ids => params[:member][:role_ids], :user_id => params[:member][: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.js {
                       render(:update) {|page|
                         page.replace_html "tab-content-members", :partial => 'projects/settings/members'
                         page << 'hideOnLoad()'
                         members.each {|member| page.visual_effect(:highlight, "member-#{member.id}") }
                       }
                     }
                   else
                     format.js {
                       render(:update) {|page|
                         errors = members.collect {|m|
                           m.errors.full_messages
                         }.flatten.uniq
                         page.alert(l(:notice_failed_to_save_members, :errors => errors.join(', ')))
                       }
                     }
                   end
                 end
               end
               def edit
                 if params[:member]
                   @member.role_ids = params[:member][:role_ids]
                 end
                 if request.post? and @member.save
               	 respond_to do |format|
                     format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
                     format.js {
                       render(:update) {|page|
                         page.replace_html "tab-content-members", :partial => 'projects/settings/members'
                         page << 'hideOnLoad()'
                         page.visual_effect(:highlight, "member-#{@member.id}")
                       }
                     }
                   end
                 end
               end
               def destroy
                 if request.post? && @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|
                       page.replace_html "tab-content-members", :partial => 'projects/settings/members'
                       page << 'hideOnLoad()'
                     }
                   }
                 end
               end
               def autocomplete_for_member
-                @principals = Principal.active.like(params[:q]).find(:all, :limit => 100) - @project.principals
+                @principals = Principal.active.not_member_of(@project).like(params[:q]).all(:limit => 100)
                 render :layout => false
               end
             end

app/models/principal.rb +10 0

             # Redmine - project management software
             # Copyright (C) 2006-2011  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 Principal < ActiveRecord::Base
               set_table_name "#{table_name_prefix}users#{table_name_suffix}"
               has_many :members, :foreign_key => 'user_id', :dependent => :destroy
               has_many :memberships, :class_name => 'Member', :foreign_key => 'user_id', :include => [ :project, :roles ], :conditions => "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}", :order => "#{Project.table_name}.name"
               has_many :projects, :through => :memberships
               has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
               # Groups and active users
               named_scope :active, :conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status = 1)"
               named_scope :like, lambda {|q|
                 s = "%#{q.to_s.strip.downcase}%"
                 {:conditions => ["LOWER(login) LIKE :s OR LOWER(firstname) LIKE :s OR LOWER(lastname) LIKE :s OR LOWER(mail) LIKE :s", {:s => s}],
                  :order => 'type, login, lastname, firstname, mail'
                 }
               }
+              # Principals that are not members of projects
+              named_scope :not_member_of, lambda {|projects|
+                projects = [projects] unless projects.is_a?(Array)
+                if projects.empty?
+                  {:conditions => "1=0"}
+                else
+                  ids = projects.map(&:id)
+                  {:conditions => ["#{Principal.table_name}.id NOT IN (SELECT DISTINCT user_id FROM #{Member.table_name} WHERE project_id IN (?))", ids]}
+                end
+              }
               before_create :set_default_empty_values
               def name(formatter = nil)
                 to_s
               end
               def <=>(principal)
                 if principal.nil?
                   -1
                 elsif self.class.name == principal.class.name
                   self.to_s.downcase <=> principal.to_s.downcase
                 else
                   # groups after users
                   principal.class.name <=> self.class.name
                 end
               end
               protected
               # Make sure we don't try to insert NULL values (see #4632)
               def set_default_empty_values
                 self.login ||= ''
                 self.hashed_password ||= ''
                 self.firstname ||= ''
                 self.lastname ||= ''
                 self.mail ||= ''
                 true
               end
             end

app/views/projects/settings/_members.html.erb +1 -1

             <%= error_messages_for 'member' %>
             <% roles = Role.find_all_givable
                members = @project.member_principals.find(:all, :include => [:roles, :principal]).sort %>
             <div class="splitcontentleft">
             <% if members.any? %>
             <table class="list members">
               <thead><tr>
                 <th><%= l(:label_user) %> / <%= l(:label_group) %></th>
                 <th><%= l(:label_role_plural) %></th>
                 <th style="width:15%"></th>
                       <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
               </tr></thead>
               <tbody>
               <% members.each do |member| %>
               <% next if member.new_record? %>
               <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
               <td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
               <td class="roles">
                 <span id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span>
                 <% if authorize_for('members', 'edit') %>
                   <% remote_form_for(:member, member, :url => {:controller => 'members', :action => 'edit', :id => member},
                                                       :method => :post,
                                                       :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }) do |f| %>
                     <p><% roles.each do |role| %>
                     <label><%= check_box_tag 'member[role_ids][]', role.id, member.roles.include?(role),
                                                                    :disabled => member.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br />
                     <% end %></p>
                     <%= hidden_field_tag 'member[role_ids][]', '' %>
                     <p><%= submit_tag l(:button_change), :class => "small" %>
                     <%= link_to_function l(:button_cancel), "$('member-#{member.id}-roles').show(); $('member-#{member.id}-roles-form').hide(); return false;" %></p>
                   <% end %>
                 <% end %>
               </td>
               <td class="buttons">
                   <%= link_to_function l(:button_edit), "$('member-#{member.id}-roles').hide(); $('member-#{member.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %>
                   <%= link_to_remote(l(:button_delete), { :url => {:controller => 'members', :action => 'destroy', :id => member},
                                                           :method => :post,
                                                           :confirm => (!User.current.admin? && member.include?(User.current) ? l(:text_own_membership_delete_confirmation) : nil)
                                                         }, :title => l(:button_delete),
                                                            :class => 'icon icon-del') if member.deletable? %>
               </td>
               <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %>
               </tr>
             <% end; reset_cycle %>
               </tbody>
             </table>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
             </div>
-            <% principals = Principal.active.find(:all, :limit => 100, :order => 'type, login, lastname ASC') - @project.principals %>
+            <% principals = Principal.active.not_member_of(@project).all(:limit => 100, :order => 'type, login, lastname ASC') %>
             <div class="splitcontentright">
             <% if roles.any? && principals.any? %>
               <% remote_form_for(:member, @member, :url => {:controller => 'members', :action => 'new', :id => @project}, :method => :post,
                                  :loading => '$(\'member-add-submit\').disable();',
                                  :complete => 'if($(\'member-add-submit\')) $(\'member-add-submit\').enable();') 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>
                 <%= observe_field(:principal_search,
                              :frequency => 0.5,
                              :update => :principals,
                              :url => { :controller => 'members', :action => 'autocomplete_for_member', :id => @project },
                              :with => 'q')
                               %>
                 <div id="principals">
                   <%= principals_check_box_tags 'member[user_ids][]', principals %>
                 </div>
                 <p><%= l(:label_role_plural) %>:
                 <% roles.each do |role| %>
                   <label><%= check_box_tag 'member[role_ids][]', role.id %> <%=h role %></label>
                  <% end %></p>
                 <p><%= submit_tag l(:button_add), :id => 'member-add-submit' %></p>
                 </fieldset>
               <% end %>
             <% end %>
             </div>

test/unit/principal_test.rb +7 0

             # Redmine - project management software
             # Copyright (C) 2006-2011  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__)
             class PrincipalTest < ActiveSupport::TestCase
+              fixtures :users, :projects, :members, :member_roles
+              def test_not_member_of_scope_should_return_users_that_have_no_memberships
+                projects = Project.find_all_by_id(1, 2)
+                expected = (Principal.all - projects.map(&:memberships).flatten.map(&:principal)).sort
+                assert_equal expected, Principal.not_member_of(projects).sort
+              end
               context "#like" do
                 setup do
                   Principal.generate!(:login => 'login')
                   Principal.generate!(:login => 'login2')
                   Principal.generate!(:firstname => 'firstname')
                   Principal.generate!(:firstname => 'firstname2')
                   Principal.generate!(:lastname => 'lastname')
                   Principal.generate!(:lastname => 'lastname2')
                   Principal.generate!(:mail => 'mail@example.com')
                   Principal.generate!(:mail => 'mail2@example.com')
                 end
                 should "search login" do
                   results = Principal.like('login')
                   assert_equal 2, results.count
                   assert results.all? {|u| u.login.match(/login/) }
                 end
                 should "search firstname" do
                   results = Principal.like('firstname')
                   assert_equal 2, results.count
                   assert results.all? {|u| u.firstname.match(/firstname/) }
                 end
                 should "search lastname" do
                   results = Principal.like('lastname')
                   assert_equal 2, results.count
                   assert results.all? {|u| u.lastname.match(/lastname/) }
                 end
                 should "search mail" do
                   results = Principal.like('mail')
                   assert_equal 2, results.count
                   assert results.all? {|u| u.mail.match(/mail/) }
                 end
               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