diff --git a/app/controllers/my_profile/profile_members_controller.rb b/app/controllers/my_profile/profile_members_controller.rb
index 8fc39be..a1abff7 100644
--- a/app/controllers/my_profile/profile_members_controller.rb
+++ b/app/controllers/my_profile/profile_members_controller.rb
@@ -2,8 +2,16 @@ class ProfileMembersController < MyProfileController
protect 'manage_memberships', :profile
def index
- @members = profile.members_by_name
- @member_role = environment.roles.find_by_name('member')
+ @filters = params[:filters] || {:roles => []}
+ @filters[:roles] = [] unless @filters[:roles]
+ @data = {}
+ field = 'name'
+ field = 'email' if @filters[:name] =~ /\@/
+
+ @data[:members] = profile.members_by(field,@filters[:name]).by_role(@filters[:roles])
+ session[:members_filtered] = @data[:members].map{|m|m.id} if request.post?
+ @data[:roles] = Profile::Roles.organization_member_roles(environment.id)
+
end
def update_roles
@@ -156,4 +164,13 @@ class ProfileMembersController < MyProfileController
end
end
+ def search_members
+ field = 'name'
+ field = 'email' if params[:filter_name] =~ /\@/
+
+ result = profile.members_like field, params[:filter_name]
+ result = result.select{|member| member.can_view_field?(current_person, "email") } if field=="email"
+ render :json => result.map { |member| {:label => "#{member.name}#{member.can_view_field?(current_person, "email") ? " <#{member.email}>" : ""}", :value => member.name }}
+ end
+
end
diff --git a/app/controllers/public/profile_controller.rb b/app/controllers/public/profile_controller.rb
index af29bc0..eec2a08 100644
--- a/app/controllers/public/profile_controller.rb
+++ b/app/controllers/public/profile_controller.rb
@@ -370,6 +370,7 @@ class ProfileController < PublicController
def send_mail
@mailing = profile.mailings.build(params[:mailing])
+ @mailing.data = session[:members_filtered] ? {:members_filtered => session[:members_filtered]} : {}
if request.post?
@mailing.locale = locale
@mailing.person = user
diff --git a/app/helpers/forms_helper.rb b/app/helpers/forms_helper.rb
index 7f04574..c0641cd 100644
--- a/app/helpers/forms_helper.rb
+++ b/app/helpers/forms_helper.rb
@@ -7,9 +7,10 @@ module FormsHelper
def labelled_check_box( human_name, name, value = "1", checked = false, options = {} )
options[:id] ||= 'checkbox-' + FormsHelper.next_id_number
- hidden_field_tag(name, '0') +
- check_box_tag( name, value, checked, options ) +
- content_tag( 'label', human_name, :for => options[:id] )
+ html = options[:add_hidden] == false ? "" : hidden_field_tag(name, '0')
+
+ html += check_box_tag( name, value, checked, options ) +
+ content_tag( 'label', human_name, :for => options[:id] )
end
def labelled_text_field( human_name, name, value=nil, options={} )
diff --git a/app/mailers/mailing.rb b/app/mailers/mailing.rb
index cb16a6a..5995f0f 100644
--- a/app/mailers/mailing.rb
+++ b/app/mailers/mailing.rb
@@ -2,7 +2,10 @@ require_dependency 'mailing_job'
class Mailing < ActiveRecord::Base
- attr_accessible :subject, :body
+ acts_as_having_settings :field => :data
+
+ attr_accessible :subject, :body, :data
+
validates_presence_of :source_id, :subject, :body
belongs_to :source, :foreign_key => :source_id, :polymorphic => true
belongs_to :person
diff --git a/app/mailers/organization_mailing.rb b/app/mailers/organization_mailing.rb
index 1829a21..9e45813 100644
--- a/app/mailers/organization_mailing.rb
+++ b/app/mailers/organization_mailing.rb
@@ -5,9 +5,16 @@ class OrganizationMailing < Mailing
end
def recipients(offset=0, limit=100)
- source.members.order(:id).offset(offset).limit(limit)
+ if data.present? and data.is_a?(Hash) and data[:members_filtered]
+ result = source.members.where('profiles.id IN (?)', data[:members_filtered])
+ end
+
+ if result.blank?
+ result = source.members.order(:id).offset(offset).limit(limit)
.joins("LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)")
.where("m.person_id" => nil)
+ end
+ result
end
def each_recipient
diff --git a/app/models/person.rb b/app/models/person.rb
index 88c84a0..0671773 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -16,10 +16,13 @@ class Person < Profile
acts_as_trackable :after_add => Proc.new {|p,t| notify_activity(t)}
acts_as_accessor
- scope :members_of, -> resources {
+ scope :members_of, lambda { |resources, field = ''|
resources = Array(resources)
+ joins = [:role_assignments]
+ joins << :user if User.attribute_names.include? field
+
conditions = resources.map {|resource| "role_assignments.resource_type = '#{resource.class.base_class.name}' AND role_assignments.resource_id = #{resource.id || -1}"}.join(' OR ')
- distinct.select('profiles.*').joins(:role_assignments).where([conditions])
+ select('DISTINCT profiles.*').joins(joins).where([conditions])
}
scope :not_members_of, -> resources {
@@ -48,6 +51,14 @@ class Person < Profile
['( roles.key = ? AND role_assignments.accessor_type = ? AND role_assignments.accessor_id = ? ) OR (
( ( friendships.person_id = ? ) OR (profiles.public_profile = ?)) AND (profiles.visible = ?) )', 'environment_administrator', Profile.name, person.id, person.id, true, true]
).uniq
+ }
+ scope :by_role, lambda { |roles|
+
+ roles = [roles] unless roles.kind_of?(Array)
+
+ if roles.length > 0
+ {:select => 'DISTINCT profiles.*', :joins => :role_assignments, :conditions => ['role_assignments.role_id IN (?)', roles] }
+ end
}
diff --git a/app/models/profile.rb b/app/models/profile.rb
index 70ad351..51364a7 100644
--- a/app/models/profile.rb
+++ b/app/models/profile.rb
@@ -155,15 +155,23 @@ class Profile < ActiveRecord::Base
include TimeScopes
- def members
+ def members(by_field = '')
scopes = plugins.dispatch_scopes(:organization_members, self)
- scopes << Person.members_of(self)
+ scopes << Person.members_of(self,by_field)
return scopes.first if scopes.size == 1
ScopeTool.union *scopes
end
- def members_by_name
- members.order('profiles.name')
+ def members_by(field,value = nil)
+ if value and !value.blank?
+ members_like(field,value).order('profiles.name')
+ else
+ members.order('profiles.name')
+ end
+ end
+
+ def members_like(field,value)
+ members(field).where("LOWER(#{field}) LIKE ?", "%#{value.downcase}%") if value
end
class << self
@@ -1098,6 +1106,10 @@ private :generate_url, :url_options
end
end
+ def can_view_field? current_person, field
+ display_private_info_to?(current_person) || (public_fields.include?(field) && public?)
+ end
+
validates_inclusion_of :redirection_after_login, :in => Environment.login_redirection_options.keys, :allow_nil => true
def preferred_login_redirection
redirection_after_login.blank? ? environment.redirection_after_login : redirection_after_login
diff --git a/app/views/profile/send_mail.html.erb b/app/views/profile/send_mail.html.erb
index 86cdead..b994e88 100644
--- a/app/views/profile/send_mail.html.erb
+++ b/app/views/profile/send_mail.html.erb
@@ -4,6 +4,9 @@
<%= error_messages_for :mailing %>
+ <% to = @mailing.data[:members_filtered].present? ? @mailing.recipients.map{|r| r.name}.join(', ') : _('All members')%>
+ <%= labelled_form_field(_('To:'), text_area(:data, 'members_filtered', :value => to, :rows => 4, :disabled => 'disabled', :class => 'send-mail-recipients')) %>
+
<%= form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do |f| %>
<%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
diff --git a/app/views/profile_members/_members_filter.erb b/app/views/profile_members/_members_filter.erb
new file mode 100644
index 0000000..cbdd0c4
--- /dev/null
+++ b/app/views/profile_members/_members_filter.erb
@@ -0,0 +1,18 @@
+<%= form_tag '#', :method => 'post' do %>
+
+ <%= field_set_tag _('Filter'), :class => 'filter_fields' do %>
+
+ <%= labelled_text_field(_('Name or Email')+': ', "filters[name]", @filters[:name], {:id => 'filter-name-autocomplete',:size => 30}) %>
+
+
+ <%= _('Roles:') %>
+ <% @data[:roles].each do |r| %>
+ <%= labelled_check_box(r.name, 'filters[roles][]', r.id, @filters[:roles].include?(r.id.to_s), :add_hidden => false) %>
+ <% end %>
+
+ <%= submit_button(:search, _('Search')) %>
+
+ <% end %>
+<% end %>
+
+<%= javascript_include_tag params[:controller] %>
\ No newline at end of file
diff --git a/app/views/profile_members/_members_list.html.erb b/app/views/profile_members/_members_list.html.erb
index fcf4279..2c92a87 100644
--- a/app/views/profile_members/_members_list.html.erb
+++ b/app/views/profile_members/_members_list.html.erb
@@ -1,4 +1,5 @@
-<% collection = @collection == :profile_admins ? profile.admins : profile.members_by_name %>
+<% members = @data ? @data[:members] : profile.members_by('name') %>
+<% collection = @collection == :profile_admins ? profile.admins : members %>
<% title = @title ? @title : _('Current members') %>
<% remove_action = @remove_action ? @remove_action : {:action => 'unassociate'} %>
@@ -9,6 +10,7 @@
<%= _('Member') %> |
<%= _('Actions') %> |
+
<% collection.each do |m| %>
| <%= link_to_profile m.short_name, m.identifier, :title => m.name %> |
@@ -26,3 +28,8 @@
<% end %>
+<% if collection.empty? %>
+
+ <%= _('No members found to: %s') % profile.name %>
+
+<% end %>
diff --git a/app/views/profile_members/index.html.erb b/app/views/profile_members/index.html.erb
index 62b7b77..bfc2f0e 100644
--- a/app/views/profile_members/index.html.erb
+++ b/app/views/profile_members/index.html.erb
@@ -2,6 +2,8 @@
<%= render :partial => 'index_buttons' %>
+<%= render :partial => 'members_filter' %>
+
<%= render :partial => 'members_list' %>
diff --git a/db/migrate/20160224132937_add_data_to_mailing.rb b/db/migrate/20160224132937_add_data_to_mailing.rb
new file mode 100644
index 0000000..9c127fb
--- /dev/null
+++ b/db/migrate/20160224132937_add_data_to_mailing.rb
@@ -0,0 +1,5 @@
+class AddDataToMailing < ActiveRecord::Migration
+ def change
+ add_column :mailings, :data, :text
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index de4ecc1..33950c9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20160202142247) do
+ActiveRecord::Schema.define(version: 20160224132937) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -471,6 +471,7 @@ ActiveRecord::Schema.define(version: 20160202142247) do
t.string "locale"
t.datetime "created_at"
t.datetime "updated_at"
+ t.text "data"
end
create_table "national_region_types", force: :cascade do |t|
diff --git a/public/designs/themes/noosfero/style.css b/public/designs/themes/noosfero/style.css
index 86fc24e..024bd71 100644
--- a/public/designs/themes/noosfero/style.css
+++ b/public/designs/themes/noosfero/style.css
@@ -48,3 +48,9 @@
width: 80px;
}
+.action-profile-send_mail .send-mail-recipients {
+ color: #888888;
+ padding: 10px;
+ width: 475px;
+ line-height: 15px;
+}
diff --git a/public/javascripts/profile_members.js b/public/javascripts/profile_members.js
new file mode 100644
index 0000000..eef0105
--- /dev/null
+++ b/public/javascripts/profile_members.js
@@ -0,0 +1,18 @@
+(function($) {
+
+ //Autocomplete to list members
+ $('#filter-name-autocomplete').autocomplete({
+ minLength:2,
+ source:function(request,response){
+ $.ajax({
+ url:document.location.pathname+'/search_members',
+ dataType:'json',
+ data:{
+ filter_name:request.term
+ },
+ success:response
+ });
+ }
+ });
+
+})(jQuery);
\ No newline at end of file
diff --git a/test/functional/profile_controller_test.rb b/test/functional/profile_controller_test.rb
index a0123fc..9e65347 100644
--- a/test/functional/profile_controller_test.rb
+++ b/test/functional/profile_controller_test.rb
@@ -1465,11 +1465,41 @@ class ProfileControllerTest < ActionController::TestCase
create_user_with_permission('profile_moderator_user', 'send_mail_to_members', community)
login_as('profile_moderator_user')
@controller.stubs(:locale).returns('pt')
+
assert_difference 'Delayed::Job.count', 1 do
post :send_mail, :profile => community.identifier, :mailing => {:subject => 'Hello', :body => 'We have some news'}
end
end
+ should 'send to members_filtered if available' do
+ community = fast_create(Community)
+ create_user_with_permission('profile_moderator_user', 'send_mail_to_members', community)
+ person = create_user('Any').person
+ community.add_member(person)
+ community.save!
+ login_as('profile_moderator_user')
+
+ post :send_mail, :profile => community.identifier, :mailing => {:subject => 'Hello', :body => 'We have some news'}
+ assert_equivalent community.members, OrganizationMailing.last.recipients
+
+ @request.session[:members_filtered] = [person.id]
+ post :send_mail, :profile => community.identifier, :mailing => {:subject => 'RUN!!', :body => 'Run to the hills!!'}
+ assert_equal [person], OrganizationMailing.last.recipients
+ end
+
+ should 'send email to all members if there is no valid member in members_filtered' do
+ community = fast_create(Community)
+ create_user_with_permission('profile_moderator_user', 'send_mail_to_members', community)
+ person = create_user('Any').person
+ community.add_member(person)
+ community.save!
+ login_as('profile_moderator_user')
+
+ @request.session[:members_filtered] = [Profile.last.id+1]
+ post :send_mail, :profile => community.identifier, :mailing => {:subject => 'RUN!!', :body => 'Run to the hills!!'}
+ assert_equivalent community.members, OrganizationMailing.last.recipients
+ end
+
should 'save mailing' do
community = fast_create(Community)
create_user_with_permission('profile_moderator_user', 'send_mail_to_members', community)
diff --git a/test/functional/profile_members_controller_test.rb b/test/functional/profile_members_controller_test.rb
index f4d010e..332a551 100644
--- a/test/functional/profile_members_controller_test.rb
+++ b/test/functional/profile_members_controller_test.rb
@@ -31,6 +31,31 @@ class ProfileMembersControllerTest < ActionController::TestCase
assert_template 'index'
end
+ should 'access index and filter members by name and roles' do
+
+ ent = fast_create(Enterprise, :identifier => 'test_enterprise', :name => 'test enterprise')
+ roles = {
+ :admin => Profile::Roles.admin(Environment.default),
+ :member => Profile::Roles.member(Environment.default)
+ }
+
+ member = create_user('test_member', :email => 'testmember@test.com.br').person
+ member.add_role(roles[:member], ent)
+
+ admin = create_user('test_admin').person
+ admin.add_role roles[:admin], ent
+
+ user = create_user_with_permission('test_user', 'manage_memberships', ent)
+ login_as :test_user
+
+ post :index, :profile => 'test_enterprise' , :filters => {:name => 'testmember@test.com.br', :roles => [roles[:member].id]}
+
+ assert_response :success
+ assert_template 'index'
+
+ assert_includes assigns(:data)[:members], member
+ end
+
should 'show form to change role' do
ent = fast_create(Enterprise, :identifier => 'test_enterprise', :name => 'test enterprise')
role = Profile::Roles.member(Environment.default)
diff --git a/test/unit/organization_mailing_test.rb b/test/unit/organization_mailing_test.rb
index e84a50a..1baedbc 100644
--- a/test/unit/organization_mailing_test.rb
+++ b/test/unit/organization_mailing_test.rb
@@ -98,6 +98,11 @@ class OrganizationMailingTest < ActiveSupport::TestCase
assert_equal [Person['user_one'], Person['user_two']], mailing.recipients
end
+ should 'return recipients previously filtered' do
+ mailing = create(OrganizationMailing, :source => community, :subject => 'Hello', :body => 'We have some news', :person => person, :data => {:members_filtered => [Person['user_one'].id,Person['user_two'].id]})
+ assert_equivalent [Person['user_one'], Person['user_two']], mailing.recipients
+ end
+
should 'return recipients according to limit' do
mailing = create(OrganizationMailing, :source => community, :subject => 'Hello', :body => 'We have some news', :person => person)
assert_equal [Person['user_one']], mailing.recipients(0, 1)
diff --git a/test/unit/profile_test.rb b/test/unit/profile_test.rb
index 8179b0e..f735ca3 100644
--- a/test/unit/profile_test.rb
+++ b/test/unit/profile_test.rb
@@ -1816,6 +1816,21 @@ class ProfileTest < ActiveSupport::TestCase
assert_equal [person], community.members
end
+ should 'return a list members by email of a community' do
+ someone = create_user('Someone', email:'someone@test.com.br')
+ someperson = create_user('Someperson',email:'someperson@test.com.br')
+
+ community = fast_create(Community)
+ community.add_member(someone.person)
+ community.add_member(someperson.person)
+
+ result = community.members_like 'email', '@test.com.br'
+
+ assert_includes result, someone.person
+ assert_includes result, someperson.person
+
+ end
+
should 'count unique members of a community' do
person = fast_create(Person)
community = fast_create(Community)
--
libgit2 0.21.2