adds member selection to organization mailing

Signed-off-by: Gustavo Jaruga <darkshades@gmail.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>

adds member selection to organization mailing
Signed-off-by: Gustavo Jaruga <darkshades@gmail.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Marcos Pereira
1 parent 80ebad1f
Showing 10 changed files with 48 additions and 18 deletions Show diff stats
app/controllers/my_profile/profile_members_controller.rb
app/mailers/organization_mailing.rb
app/models/profile.rb
app/views/profile_members/_index_buttons.html.erb
app/views/profile_members/_members_list.html.erb
app/views/profile_members/index.html.erb
features/send_email_to_organization_members.feature
public/javascripts/profile_members.js
test/functional/profile_controller_test.rb
test/functional/profile_members_controller_test.rb
@@ -10,10 +10,20 @@ class ProfileMembersController &lt; MyProfileController
     @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)
+    @data[:roles] = Profile::Roles.organization_member_roles(environment.id) | Profile::Roles.organization_custom_roles(environment.id, profile.id)
   end
+  def send_mail
+    session[:members_filtered] = params[:members_filtered].select{|value| value!="0"}
+    if session[:members_filtered].present?
+      redirect_to :controller => :profile, :action => :send_mail
+    else
+      session[:notice] = _("Select at least one member.")
+      redirect_to :action => :index
+    end
+  end
+
   def update_roles
     @roles = params[:roles] ? environment.roles.find(params[:roles].select{|r|!r.to_i.zero?}) : []
     @roles = @roles.select{|r| r.has_kind?('Profile') }
@@ -5,13 +5,14 @@ class OrganizationMailing &lt; Mailing
   end
   def recipients(offset=0, limit=100)
+    result = 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])
+      result = result.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)")
+      result = result.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
@@ -49,6 +49,9 @@ class Profile &lt; ActiveRecord::Base
     def self.organization_member_roles(env_id)
       all_roles(env_id).select{ |r| r.key.match(/^profile_/) unless r.key.blank? || !r.profile_id.nil?}
     end
+    def self.organization_custom_roles(env_id, profile_id)
+      all_roles(env_id).where('profile_id = ?', profile_id)
+    end
     def self.all_roles(env_id)
       Role.where(environment_id: env_id)
     end
@@ -5,7 +5,7 @@
     <%= button :person, _('Invite people to join'), :controller => 'invite', :action => 'invite_friends' %>
   <% end %>
   <% if profile.community? and user.has_permission?(:send_mail_to_members, profile) %>
-    <%= button :send, _('Send e-mail to members'), :controller => 'profile', :action => 'send_mail' %>
+    <%= submit_button(:send, _('Send e-mail to members')) %>
   <% end %>
   <% @plugins.dispatch(:manage_members_extra_buttons).each do |plugin_button| %>
     <%= button plugin_button[:icon], plugin_button[:title], plugin_button[:url] %>
@@ -2,17 +2,21 @@
 <% collection = @collection == :profile_admins ? profile.admins : members %>
 <% title = @title ? @title : _('Current members') %>
 <% remove_action = @remove_action ? @remove_action : {:action => 'unassociate'} %>
+<%= javascript_include_tag params[:controller] %>
 <h3><%= title %></h3>
 <table>
+  <col width="1">
   <tr>
+    <th><%= check_box_tag 'checkbox-all', 1, false, :onClick => "toggle(this)"  %></th>
     <th><%= _('Member') %></th>
     <th><%= _('Actions') %></th>
   </tr>
   <% collection.each do |m| %>
     <tr title="<%= m.name %>">
+      <td><%= labelled_check_box('', 'members_filtered[]', m.id.to_s, false, :id => 'checkbox-'+m.identifier) %></td>
       <td><%= link_to_profile m.short_name, m.identifier, :title => m.name %> </td>
       <td>
         <div class="members-buttons-cell">
 <h1><%= h profile.short_name(50) %></h1>
-<%= render :partial => 'index_buttons' %>
-
 <%= render :partial => 'members_filter' %>
-<div id="members-list">
-  <%= render :partial => 'members_list' %>
-</div>
+<%= form_tag 'profile_members/send_mail', :method => 'post' do %>
+  <div id="members-list">
+    <%= render :partial => 'members_list' %>
+  </div>
+
+  <%= render :partial => 'index_buttons' %>
-<%= render :partial => 'index_buttons' %>
+<% end %>
@@ -31,7 +31,8 @@ Feature: send emails to organization members
   Scenario: Send e-mail to members
     Given I am logged in as "joaosilva"
     And I go to Sample Community's members management
-    And I follow "Send e-mail to members"
+    And I check "checkbox-manoel"
+    And I press "Send e-mail to members"
     And I fill in "Subject" with "Hello, member!"
     And I fill in "Body" with "We have some news"
     When I press "Send"
@@ -40,7 +41,8 @@ Feature: send emails to organization members
   Scenario: Not send e-mail to members if subject is blank
     Given I am logged in as "joaosilva"
     And I go to Sample Community's members management
-    And I follow "Send e-mail to members"
+    And I check "checkbox-manoel"
+    And I press "Send e-mail to members"
     And I fill in "Body" with "We have some news"
     When I press "Send"
     Then I should be on /profile/sample-community/send_mail
@@ -48,7 +50,8 @@ Feature: send emails to organization members
   Scenario: Not send e-mail to members if body is blank
     Given I am logged in as "joaosilva"
     And I go to Sample Community's members management
-    And I follow "Send e-mail to members"
+    And I check "checkbox-manoel"
+    And I press "Send e-mail to members"
     And I fill in "Subject" with "Hello, user!"
     When I press "Send"
     Then I should be on /profile/sample-community/send_mail
@@ -56,7 +59,8 @@ Feature: send emails to organization members
   Scenario: Cancel creation of mailing
     Given I am logged in as "joaosilva"
     And I go to Sample Community's members management
-    And I follow "Send e-mail to members"
+    And I check "checkbox-manoel"
+    And I press "Send e-mail to members"
     When I follow "Cancel e-mail"
     Then I should be on Sample Community's members management
@@ -14,5 +14,12 @@
       });
    }
   });
+})(jQuery);
-})(jQuery);
 \ No newline at end of file
+
+function toggle(source) {
+  checkboxes = document.getElementsByName('members_filtered[]');
+  for(var i=0, n=checkboxes.length;i<n;i++) {
+    checkboxes[i].checked = source.checked;
+  }
+}
@@ -1497,7 +1497,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     @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
+    assert_empty OrganizationMailing.last.recipients
   end
   should 'save mailing' do
@@ -196,7 +196,7 @@ class ProfileMembersControllerTest &lt; ActionController::TestCase
     login_as :test_user
     get :index, :profile => community.identifier
-    assert_tag :tag => 'a', :attributes => {:href => /send_mail/}
+    assert_tag :tag => 'input', :attributes => {:value => 'Send e-mail to members'}
   end
   should 'not display send email to members if doesn\'t have the permission' do
	@@ -10,10 +10,20 @@ class ProfileMembersController < MyProfileController		@@ -10,10 +10,20 @@ class ProfileMembersController < MyProfileController
10		10
11	@data[:members] = profile.members_by(field,@filters[:name]).by_role(@filters[:roles])	11	@data[:members] = profile.members_by(field,@filters[:name]).by_role(@filters[:roles])
12	session[:members_filtered] = @data[:members].map{\|m\|m.id} if request.post?	12	session[:members_filtered] = @data[:members].map{\|m\|m.id} if request.post?
13	- @data[:roles] = Profile::Roles.organization_member_roles(environment.id)	13	+ @data[:roles] = Profile::Roles.organization_member_roles(environment.id) \| Profile::Roles.organization_custom_roles(environment.id, profile.id)
14		14
15	end	15	end
16		16
		17	+ def send_mail
		18	+ session[:members_filtered] = params[:members_filtered].select{\|value\| value!="0"}
		19	+ if session[:members_filtered].present?
		20	+ redirect_to :controller => :profile, :action => :send_mail
		21	+ else
		22	+ session[:notice] = _("Select at least one member.")
		23	+ redirect_to :action => :index
		24	+ end
		25	+ end
		26	+
17	def update_roles	27	def update_roles
18	@roles = params[:roles] ? environment.roles.find(params[:roles].select{\|r\|!r.to_i.zero?}) : []	28	@roles = params[:roles] ? environment.roles.find(params[:roles].select{\|r\|!r.to_i.zero?}) : []
19	@roles = @roles.select{\|r\| r.has_kind?('Profile') }	29	@roles = @roles.select{\|r\| r.has_kind?('Profile') }
	@@ -5,7 +5,7 @@		@@ -5,7 +5,7 @@
5	<%= button :person, _('Invite people to join'), :controller => 'invite', :action => 'invite_friends' %>	5	<%= button :person, _('Invite people to join'), :controller => 'invite', :action => 'invite_friends' %>
6	<% end %>	6	<% end %>
7	<% if profile.community? and user.has_permission?(:send_mail_to_members, profile) %>	7	<% if profile.community? and user.has_permission?(:send_mail_to_members, profile) %>
8	- <%= button :send, _('Send e-mail to members'), :controller => 'profile', :action => 'send_mail' %>	8	+ <%= submit_button(:send, _('Send e-mail to members')) %>
9	<% end %>	9	<% end %>
10	<% @plugins.dispatch(:manage_members_extra_buttons).each do \|plugin_button\| %>	10	<% @plugins.dispatch(:manage_members_extra_buttons).each do \|plugin_button\| %>
11	<%= button plugin_button[:icon], plugin_button[:title], plugin_button[:url] %>	11	<%= button plugin_button[:icon], plugin_button[:title], plugin_button[:url] %>
	@@ -14,5 +14,12 @@		@@ -14,5 +14,12 @@
14	});	14	});
15	}	15	}
16	});	16	});
		17	+})(jQuery);
17		18
18	-})(jQuery);
19	\ No newline at end of file	19	\ No newline at end of file
		20	+
		21	+function toggle(source) {
		22	+ checkboxes = document.getElementsByName('members_filtered[]');
		23	+ for(var i=0, n=checkboxes.length;i<n;i++) {
		24	+ checkboxes[i].checked = source.checked;
		25	+ }
		26	+}
	@@ -1497,7 +1497,7 @@ class ProfileControllerTest < ActionController::TestCase		@@ -1497,7 +1497,7 @@ class ProfileControllerTest < ActionController::TestCase
1497		1497
1498	@request.session[:members_filtered] = [Profile.last.id+1]	1498	@request.session[:members_filtered] = [Profile.last.id+1]
1499	post :send_mail, :profile => community.identifier, :mailing => {:subject => 'RUN!!', :body => 'Run to the hills!!'}	1499	post :send_mail, :profile => community.identifier, :mailing => {:subject => 'RUN!!', :body => 'Run to the hills!!'}
1500	- assert_equivalent community.members, OrganizationMailing.last.recipients	1500	+ assert_empty OrganizationMailing.last.recipients
1501	end	1501	end
1502		1502
1503	should 'save mailing' do	1503	should 'save mailing' do
	@@ -196,7 +196,7 @@ class ProfileMembersControllerTest < ActionController::TestCase		@@ -196,7 +196,7 @@ class ProfileMembersControllerTest < ActionController::TestCase
196	login_as :test_user	196	login_as :test_user
197		197
198	get :index, :profile => community.identifier	198	get :index, :profile => community.identifier
199	- assert_tag :tag => 'a', :attributes => {:href => /send_mail/}	199	+ assert_tag :tag => 'input', :attributes => {:value => 'Send e-mail to members'}
200	end	200	end
201		201
202	should 'not display send email to members if doesn\'t have the permission' do	202	should 'not display send email to members if doesn\'t have the permission' do