Merge commit 'refs/merge-requests/410' of git://gitorious.org/noosfero/noosfero …

…into merge-requests/410

Merge commit 'refs/merge-requests/410' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/410
Rodrigo Souto
2 parents 15717094 9dfe5a7c
Showing 16 changed files with 347 additions and 19 deletions Show diff stats
app/controllers/admin/users_controller.rb
app/controllers/application_controller.rb
app/helpers/users_helper.rb
app/models/person.rb
app/models/profile.rb
app/models/user.rb
app/views/users/_index_buttons.rhtml
app/views/users/_users_list.rhtml
app/views/users/_users_search_form.rhtml
app/views/users/index.rhtml
public/designs/icons/tango/style.css
public/stylesheets/application.css
test/functional/users_controller_test.rb
test/unit/person_test.rb
test/unit/profile_test.rb
test/unit/user_test.rb
@@ -4,12 +4,62 @@ class UsersController &lt; AdminController
   protect 'manage_environment_users', :environment
+  include UsersHelper
+
+  def per_page
+    10
+  end
+
   def index
+    @filter = params[:filter]
+    if @filter.blank? || @filter == 'all_users'
+      @filter = 'all_users'
+      scope = environment.people.no_templates(environment)
+    elsif @filter == 'admin_users'
+      scope = environment.people.no_templates(environment).admins
+    elsif @filter == 'activated_users'
+      scope = environment.people.no_templates(environment).activated
+    elsif @filter == 'deactivated_users'
+      scope = environment.people.no_templates(environment).deactivated
+    end
+    @q = params[:q]
+    if @q.blank?
+      @collection = scope.paginate(:per_page => per_page, :page => params[:npage])
+    else
+      @collection = find_by_contents(:people, scope, @q, {:per_page => per_page, :page => params[:npage]})[:results]
+    end
+  end
+
+  def set_admin_role
+    person = environment.people.find(params[:id])
+    environment.add_admin(person)
+    redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
+  end
+
+  def reset_admin_role
+    person = environment.people.find(params[:id])
+    environment.remove_admin(person)
+    redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
+  end
+
+  def activate
+    person = environment.people.find(params[:id])
+    person.user.activate
+    redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
+  end
+
+  def deactivate
+    person = environment.people.find(params[:id])
+    person.user.deactivate
+    redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
+  end
+
+  def download
     respond_to do |format|
       format.html
       format.xml do
-        @users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
-        send_data @users.to_xml(
+        users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
+        send_data users.to_xml(
             :skip_types => true,
             :only => %w[email login created_at updated_at],
             :include => { :person => {:only => %w[name updated_at created_at address birth_date contact_phone identifier lat lng] } }),
@@ -79,7 +79,7 @@ class ApplicationController &lt; ActionController::Base
   helper_method :current_person, :current_person
-  protected
+  # protected
   def setup_multitenancy
     Noosfero::MultiTenancy.setup!(request.host)
@@ -0,0 +1,25 @@
+module UsersHelper
+
+  FILTER_TRANSLATION = {
+      'all_users' => _('All users'),
+      'admin_users' => _('Admin users'),
+      'activated_users' => _('Activated users'),
+      'deactivated_users' => _('Deativated users'),
+  }
+
+  def filter_selector(filter, float = 'right')
+    options = options_for_select(FILTER_TRANSLATION.map {|key, name| [name, key]}, :selected => filter)
+    url_params = url_for(params.merge(:filter => 'FILTER'))
+    onchange = "document.location.href = '#{url_params}'.replace('FILTER', this.value)"
+    select_field = select_tag(:filter, options, :onchange => onchange)
+    content_tag('div',
+      content_tag('strong', _('Filter')) + ': ' + select_field,
+      :class => "environment-users-customize-search"
+    )
+  end
+
+  def filter_title(filter)
+    FILTER_TRANSLATION[filter]
+  end
+
+end
@@ -75,6 +75,10 @@ class Person &lt; Profile
   named_scope :abusers, :joins => :abuse_complaints, :conditions => ['tasks.status = 3'], :select => 'DISTINCT profiles.*'
   named_scope :non_abusers, :joins => "LEFT JOIN tasks ON profiles.id = tasks.requestor_id AND tasks.type='AbuseComplaint'", :conditions => ["tasks.status != 3 OR tasks.id is NULL"], :select => "DISTINCT profiles.*"
+  named_scope :admins, :joins => [:role_assignments => :role], :conditions => ['roles.key = ?', 'environment_administrator' ]
+  named_scope :activated, :joins => :user, :conditions => ['users.activation_code IS NULL AND users.activated_at IS NOT NULL']
+  named_scope :deactivated, :joins => :user, :conditions => ['NOT (users.activation_code IS NULL AND users.activated_at IS NOT NULL)']
+
   after_destroy do |person|
     Friendship.find(:all, :conditions => { :friend_id => person.id}).each { |friendship| friendship.destroy }
   end
@@ -79,6 +79,7 @@ class Profile &lt; ActiveRecord::Base
   named_scope :enterprises, lambda { {:conditions => (Enterprise.send(:subclasses).map(&:name) << 'Enterprise').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
   named_scope :communities, lambda { {:conditions => (Community.send(:subclasses).map(&:name) << 'Community').map { |klass| "profiles.type = '#{klass}'"}.join(" OR ")} }
   named_scope :templates, lambda { |environment| { :conditions => {:is_template => true, :environment_id => environment.id} } }
+  named_scope :no_templates, lambda { |environment| { :conditions => {:is_template => false, :environment_id => environment.id} } }
   def members
     scopes = plugins.dispatch_scopes(:organization_members, self)
@@ -143,6 +143,21 @@ class User &lt; ActiveRecord::Base
     end
   end
+  # Deactivates the user in the database.
+  def deactivate
+    return false unless self.person
+    self.activated_at = nil
+    self.person.visible = false
+    begin
+      self.person.save! && self.save!
+    rescue Exception => exception
+      logger.error(exception.to_s)
+      false
+    else
+      true
+    end
+  end
+
   def activated?
     self.activation_code.nil? && !self.activated_at.nil?
   end
@@ -0,0 +1,6 @@
+<% button_bar do %>
+  <%= button :'text-plain', _('User list as [CSV]'), :action => :download, :format => 'csv' %>
+  <%= button :'text-html', _('User list as [XML]'), :action => :download, :format => 'xml' %>
+  <%= button :send, _('Send e-mail to all users'), :action => 'send_mail' %>
+  <%= button :back, _('Back'), :controller => 'admin_panel' %>
+<% end %>
@@ -0,0 +1,33 @@
+<div class="environment-users-results-header">
+  <div id='environment-users-filter-title'><%= filter_title(@filter) %></div>
+  <%= filter_selector(@filter) %>
+  <div style="clear: both"></div>
+</div>
+
+<table>
+  <tr>
+    <th><%= _('Member') %></th>
+    <th><%= _('Actions') %></th>
+  </tr>
+  <% @collection.each do |p| %>
+    <tr title="<%= p.name %>">
+      <td><%= link_to_profile p.short_name, p.identifier, :title => p.name %> </td>
+      <td>
+        <div class="members-buttons-cell">
+        	<% if p.is_admin? %>
+          	<%= button_without_text :'reset-admin-role', _('Reset admin role'), :action => 'reset_admin_role', :id => p, :q => @q, :filter => @filter %>
+          	<% else %>
+          	<%= button_without_text :'set-admin-role', _('Set admin role'), :action => 'set_admin_role', :id => p, :q => @q, :filter => @filter %>
+          	<% end %>
+        	<% if !p.user.activated? %>
+          	<%= button_without_text :'activate-user', _('Activate user'), :action => 'activate', :id => p, :q => @q, :filter => @filter %>
+          	<% else %>
+          	<%= button_without_text :'deactivate-user', _('Deactivate user'), :action => 'deactivate', :id => p, :q => @q, :filter => @filter %>
+          	<% end %>
+        </div>
+      </td>
+    </tr>
+  <% end %>
+</table>
+
+<%= pagination_links @collection, {:param_name => 'npage', :page_links => true} %>
@@ -0,0 +1,6 @@
+  <div class="search-field">
+    <span class="formfield">
+      <%= text_field_tag 'q', @q, :title => _("Find users") %>
+    </span>
+    <%= submit_button(:search, _('Search')) %>
+  </div>
 \ No newline at end of file
 <h1><%= _('Manage users') %></h1>
-<ul>
-  <li>
-    <%= _('Download users list') %>:
-    <%= link_to '[CSV]', :format => 'csv' %>
-    <%= link_to '[XML]', :format => 'xml' %>
-  </li>
-  <li>
-    <%= link_to _('Send e-mail to users'), :action => 'send_mail' %>
-  </li>
-</ul>
-
-<% button_bar do %>
-  <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>
+<% form_tag( { :action => 'index' }, :method => 'get', :class => 'users-search' ) do %>
+<div id="search-users">
+  <%= render :partial => 'users_search_form' %>
+</div>
+<div id="users-list">
+  <%= render :partial => 'users_list' %>
+</div>
 <% end %>
+
+<%= render :partial => 'index_buttons' %>
 \ No newline at end of file
@@ -100,6 +100,11 @@
 .icon-user-unknown { background-image: url(Tango/16x16/status/dialog-error.png) }
 .icon-alert        { background-image: url(Tango/16x16/status/dialog-warning.png) }
+.icon-activate-user           { background-image: url(Tango/16x16/emblems/emblem-system.png) }
+.icon-deactivate-user         { background-image: url(Tango/16x16/emblems/emblem-unreadable.png) }
+.icon-set-admin-role          { background-image: url(mod/16x16/apps/user.png) }
+.icon-reset-admin-role        { background-image: url(/images/icons-app/person-icon.png) }
+
 /******************LARGE ICONS********************/
 .image-gallery-item .folder  { background-image: url(mod/96x96/places/folder.png) }
 .image-gallery-item .gallery { background-image: url(mod/96x96/mimetypes/image-x-generic.png) }
@@ -4179,6 +4179,33 @@ h1#agenda-title {
   -webkit-border-radius:10px;
 }
+/* ==> public/stylesheets/controller_environment_users.css <== */
+.controller-environment_users table {
+  text-align: left;
+}
+
+#environment-users-search form {
+  padding: 10px;
+  margin-bottom: 15px;
+  background-color: #E6E6E6;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+}
+
+.environment-users-results-header {
+  font-size: 0.9em;
+  padding: 6px 0px 0px 0px;
+  margin:0 0 5px 0;
+  border-bottom: 2px dotted #999;
+  text-align: right;
+}
+#environment-users-filter-title {
+  font-weight: bold;
+  font-size: 130%;
+  line-height: 35px;
+  float: left;
+}
+
 /* * * Profile search * * * * * * * */
 #public-profile-search, #profile-search-results form, .profile-search-block form {
@@ -6,11 +6,16 @@ class UsersController; def rescue_action(e) raise e end; end
 class UsersControllerTest < ActionController::TestCase
-  all_fixtures
   def setup
     @controller = UsersController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+
+    
+    Environment.delete_all
+    Environment.create(:name => 'some env', :is_default => true)
+    admin_user = create_user_with_permission('adminuser', 'manage_environment_users', Environment.default)
+    login_as('adminuser')
   end
   should 'not access without right permission' do
@@ -28,11 +33,83 @@ class UsersControllerTest &lt; ActionController::TestCase
     assert_response :success
   end
+  should 'blank search results include activated and deactivated users' do
+    deactivated = create_user('deactivated')
+    deactivated.activated_at = nil
+    deactivated.person.visible = false
+    deactivated.save!
+    get :index, :q => ''
+    assert_tag :tag => 'div', :attributes => { :id => /users-list/ }, :descendant => {:tag => 'a', :attributes => {:title => /adminuser/}}    
+    assert_tag :tag => 'div', :attributes => { :id => /users-list/ }, :descendant => {:tag => 'a', :attributes => {:title => /deactivated/}}    
+  end
+  
+  should 'blank search include all users' do
+    (1..5).each {|i|
+      u = create_user('user'+i.to_s)
+    }
+    get :index, :q => '' # blank search
+    assert_tag :tag => 'div', :attributes => { :id => /users-list/ }, :descendant => {:tag => 'a', :attributes => {:title => /adminuser/}}
+    (1..5).each {|i|
+      u = 'user'+i.to_s
+      assert_tag :tag => 'div', :attributes => { :id => /users-list/ }, :descendant => {:tag => 'a', :attributes => {:title => u}}    
+    }
+  end
+  
+  should 'search not include all users' do
+    (1..5).each {|i|
+      u = create_user('user'+i.to_s)
+    }
+    get :index, :q => 'er5' # search
+    assert_tag :tag => 'div', :attributes => { :id => /users-list/ }, :descendant => {:tag => 'a', :attributes => {:title => /user5/}}
+    (1..4).each {|i|
+      u = 'user'+i.to_s
+      assert_no_tag :tag => 'div', :attributes => { :id => /users-list/ }, :descendant => {:tag => 'a', :attributes => {:title => u}}    
+    }
+  end
+  
+  should 'set admin role' do
+    u = create_user()
+    assert_equal false, u.person.is_admin?
+    post :set_admin_role, :id => u.person.id, :q => ''
+    u.reload
+    assert u.person.is_admin?
+  end
+
+  should 'reset admin role' do
+    u = create_user()
+    e = Environment.default
+    e.add_admin(u.person)
+    u.reload
+    assert u.person.is_admin?
+    post :reset_admin_role, :id => u.person.id, :q => ''
+    u.reload
+    assert_equal false, u.person.is_admin?
+  end
+
+  should 'activate user' do
+    u = create_user()
+    assert_equal false, u.activated?
+    post :activate, :id => u.person.id, :q => ''
+    u.reload
+    assert u.activated?
+  end
+
+  should 'deactivate user' do
+    u = create_user()
+    u.activated_at = Time.now.utc
+    u.activation_code = nil
+    u.person.visible = true
+    assert u.activated?
+    post :deactivate, :id => u.person.id, :q => ''
+    u.reload
+    assert_equal false, u.activated?
+  end
+
   should 'response as XML to export users' do
     admin_user = create_user_with_permission('admin_user', 'manage_environment_users', Environment.default)
     login_as('admin_user')
-    get :index, :format => 'xml'
+    get :download, :format => 'xml'
     assert_equal 'text/xml', @response.content_type
   end
@@ -40,7 +117,7 @@ class UsersControllerTest &lt; ActionController::TestCase
     admin_user = create_user_with_permission('admin_user', 'manage_environment_users', Environment.default)
     login_as('admin_user')
-    get :index, :format => 'csv'
+    get :download, :format => 'csv'
     assert_equal 'text/csv', @response.content_type
     assert_equal 'name;email', @response.body.split("\n")[0]
   end
@@ -1335,4 +1335,56 @@ class PersonTest &lt; ActiveSupport::TestCase
     assert_includes non_abusers, not_abuser
   end
+  should 'admins named_scope return persons who are admin users' do
+    Person.delete_all
+    e = Environment.default
+    admins = []
+    (1..5).each {|i|
+      u = create_user('user'+i.to_s)
+      e.add_admin(u.person)
+      admins << u.person    
+    }
+    (6..10).each {|i|
+      u = create_user('user'+i.to_s)
+    }
+    assert_equal admins, Person.admins 
+  end
+
+  should 'activated named_scope return persons who are activated users' do
+    Person.delete_all
+    e = Environment.default
+    activated = []
+    (1..5).each {|i|
+      u = create_user('user'+i.to_s)
+      u.activated_at = Time.now.utc
+      u.activation_code = nil
+      u.save!
+      activated << u.person    
+    }
+    (6..10).each {|i|
+      u = create_user('user'+i.to_s)
+      u.activated_at = nil
+      u.save!
+    }
+    assert_equal activated, Person.activated 
+  end
+
+  should 'deactivated named_scope return persons who are deactivated users' do
+    Person.delete_all
+    e = Environment.default
+    deactivated = []
+    (1..5).each {|i|
+      u = create_user('user'+i.to_s)
+      u.activated_at = nil
+      u.save!
+      deactivated << u.person    
+    }
+    (6..10).each {|i|
+      u = create_user('user'+i.to_s)
+      u.activated_at = Time.now.utc
+      u.activation_code = nil
+      u.save!
+    }
+    assert_equal deactivated, Person.deactivated 
+  end
 end
@@ -1379,6 +1379,18 @@ class ProfileTest &lt; ActiveSupport::TestCase
     assert_not_includes Profile.templates(Environment.default), profile
   end
+  should 'return a list of profiles that are not templates' do
+    p1 = fast_create(Profile, :is_template => false)
+    p2 = fast_create(Profile, :is_template => false)
+    t1 = fast_create(Profile, :is_template => true)
+    t2 = fast_create(Profile, :is_template => true)
+
+    assert_includes Profile.no_templates(Environment.default), p1
+    assert_includes Profile.no_templates(Environment.default), p2
+    assert_not_includes Profile.no_templates(Environment.default), t1
+    assert_not_includes Profile.no_templates(Environment.default), t2
+  end
+
   should 'not crash on a profile update with a destroyed template' do
     template = fast_create(Profile, :is_template => true)
     profile = fast_create(Profile, :template_id => template.id)
@@ -518,6 +518,25 @@ class UserTest &lt; ActiveSupport::TestCase
     end
   end
+  should 'deactivate an user' do
+    user = new_user
+    user.activated_at = Time.now.utc
+    user.person.visible = true
+    assert user.deactivate
+    assert_nil user.activated_at
+    assert !user.person.visible
+  end
+
+  should 'return if the user is deactivated' do
+    user = new_user
+    user.activated_at = Time.now.utc
+    user.activation_code = nil
+    user.person.visible = true
+    assert user.activated?
+    user.deactivate
+    assert !user.activated?
+  end
+  
   should 'activate right after creation when confirmation is not required' do
     e = Environment.default
     e.enable('skip_new_user_email_confirmation')
	@@ -4,12 +4,62 @@ class UsersController < AdminController		@@ -4,12 +4,62 @@ class UsersController < AdminController
4		4
5	protect 'manage_environment_users', :environment	5	protect 'manage_environment_users', :environment
6		6
		7	+ include UsersHelper
		8	+
		9	+ def per_page
		10	+ 10
		11	+ end
		12	+
7	def index	13	def index
		14	+ @filter = params[:filter]
		15	+ if @filter.blank? \|\| @filter == 'all_users'
		16	+ @filter = 'all_users'
		17	+ scope = environment.people.no_templates(environment)
		18	+ elsif @filter == 'admin_users'
		19	+ scope = environment.people.no_templates(environment).admins
		20	+ elsif @filter == 'activated_users'
		21	+ scope = environment.people.no_templates(environment).activated
		22	+ elsif @filter == 'deactivated_users'
		23	+ scope = environment.people.no_templates(environment).deactivated
		24	+ end
		25	+ @q = params[:q]
		26	+ if @q.blank?
		27	+ @collection = scope.paginate(:per_page => per_page, :page => params[:npage])
		28	+ else
		29	+ @collection = find_by_contents(:people, scope, @q, {:per_page => per_page, :page => params[:npage]})[:results]
		30	+ end
		31	+ end
		32	+
		33	+ def set_admin_role
		34	+ person = environment.people.find(params[:id])
		35	+ environment.add_admin(person)
		36	+ redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
		37	+ end
		38	+
		39	+ def reset_admin_role
		40	+ person = environment.people.find(params[:id])
		41	+ environment.remove_admin(person)
		42	+ redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
		43	+ end
		44	+
		45	+ def activate
		46	+ person = environment.people.find(params[:id])
		47	+ person.user.activate
		48	+ redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
		49	+ end
		50	+
		51	+ def deactivate
		52	+ person = environment.people.find(params[:id])
		53	+ person.user.deactivate
		54	+ redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
		55	+ end
		56	+
		57	+ def download
8	respond_to do \|format\|	58	respond_to do \|format\|
9	format.html	59	format.html
10	format.xml do	60	format.xml do
11	- @users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
12	- send_data @users.to_xml(	61	+ users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
		62	+ send_data users.to_xml(
13	:skip_types => true,	63	:skip_types => true,
14	:only => %w[email login created_at updated_at],	64	:only => %w[email login created_at updated_at],
15	:include => { :person => {:only => %w[name updated_at created_at address birth_date contact_phone identifier lat lng] } }),	65	:include => { :person => {:only => %w[name updated_at created_at address birth_date contact_phone identifier lat lng] } }),
	@@ -79,7 +79,7 @@ class ApplicationController < ActionController::Base		@@ -79,7 +79,7 @@ class ApplicationController < ActionController::Base
79		79
80	helper_method :current_person, :current_person	80	helper_method :current_person, :current_person
81		81
82	- protected	82	+ # protected
83		83
84	def setup_multitenancy	84	def setup_multitenancy
85	Noosfero::MultiTenancy.setup!(request.host)	85	Noosfero::MultiTenancy.setup!(request.host)
@@ -0,0 +1,25 @@		@@ -0,0 +1,25 @@
	1	+module UsersHelper
	2	+
	3	+ FILTER_TRANSLATION = {
	4	+ 'all_users' => _('All users'),
	5	+ 'admin_users' => _('Admin users'),
	6	+ 'activated_users' => _('Activated users'),
	7	+ 'deactivated_users' => _('Deativated users'),
	8	+ }
	9	+
	10	+ def filter_selector(filter, float = 'right')
	11	+ options = options_for_select(FILTER_TRANSLATION.map {\|key, name\| [name, key]}, :selected => filter)
	12	+ url_params = url_for(params.merge(:filter => 'FILTER'))
	13	+ onchange = "document.location.href = '#{url_params}'.replace('FILTER', this.value)"
	14	+ select_field = select_tag(:filter, options, :onchange => onchange)
	15	+ content_tag('div',
	16	+ content_tag('strong', _('Filter')) + ': ' + select_field,
	17	+ :class => "environment-users-customize-search"
	18	+ )
	19	+ end
	20	+
	21	+ def filter_title(filter)
	22	+ FILTER_TRANSLATION[filter]
	23	+ end
	24	+
	25	+end
	@@ -79,6 +79,7 @@ class Profile < ActiveRecord::Base		@@ -79,6 +79,7 @@ class Profile < ActiveRecord::Base
79	named_scope :enterprises, lambda { {:conditions => (Enterprise.send(:subclasses).map(&:name) << 'Enterprise').map { \|klass\| "profiles.type = '#{klass}'"}.join(" OR ")} }	79	named_scope :enterprises, lambda { {:conditions => (Enterprise.send(:subclasses).map(&:name) << 'Enterprise').map { \|klass\| "profiles.type = '#{klass}'"}.join(" OR ")} }
80	named_scope :communities, lambda { {:conditions => (Community.send(:subclasses).map(&:name) << 'Community').map { \|klass\| "profiles.type = '#{klass}'"}.join(" OR ")} }	80	named_scope :communities, lambda { {:conditions => (Community.send(:subclasses).map(&:name) << 'Community').map { \|klass\| "profiles.type = '#{klass}'"}.join(" OR ")} }
81	named_scope :templates, lambda { \|environment\| { :conditions => {:is_template => true, :environment_id => environment.id} } }	81	named_scope :templates, lambda { \|environment\| { :conditions => {:is_template => true, :environment_id => environment.id} } }
		82	+ named_scope :no_templates, lambda { \|environment\| { :conditions => {:is_template => false, :environment_id => environment.id} } }
82		83
83	def members	84	def members
84	scopes = plugins.dispatch_scopes(:organization_members, self)	85	scopes = plugins.dispatch_scopes(:organization_members, self)
	@@ -143,6 +143,21 @@ class User < ActiveRecord::Base		@@ -143,6 +143,21 @@ class User < ActiveRecord::Base
143	end	143	end
144	end	144	end
145		145
		146	+ # Deactivates the user in the database.
		147	+ def deactivate
		148	+ return false unless self.person
		149	+ self.activated_at = nil
		150	+ self.person.visible = false
		151	+ begin
		152	+ self.person.save! && self.save!
		153	+ rescue Exception => exception
		154	+ logger.error(exception.to_s)
		155	+ false
		156	+ else
		157	+ true
		158	+ end
		159	+ end
		160	+
146	def activated?	161	def activated?
147	self.activation_code.nil? && !self.activated_at.nil?	162	self.activation_code.nil? && !self.activated_at.nil?
148	end	163	end
@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
	1	+<% button_bar do %>
	2	+ <%= button :'text-plain', _('User list as [CSV]'), :action => :download, :format => 'csv' %>
	3	+ <%= button :'text-html', _('User list as [XML]'), :action => :download, :format => 'xml' %>
	4	+ <%= button :send, _('Send e-mail to all users'), :action => 'send_mail' %>
	5	+ <%= button :back, _('Back'), :controller => 'admin_panel' %>
	6	+<% end %>
@@ -0,0 +1,33 @@		@@ -0,0 +1,33 @@
	1	+<div class="environment-users-results-header">
	2	+ <div id='environment-users-filter-title'><%= filter_title(@filter) %></div>
	3	+ <%= filter_selector(@filter) %>
	4	+ <div style="clear: both"></div>
	5	+</div>
	6	+
	7	+<table>
	8	+ <tr>
	9	+ <th><%= _('Member') %></th>
	10	+ <th><%= _('Actions') %></th>
	11	+ </tr>
	12	+ <% @collection.each do \|p\| %>
	13	+ <tr title="<%= p.name %>">
	14	+ <td><%= link_to_profile p.short_name, p.identifier, :title => p.name %> </td>
	15	+ <td>
	16	+ <div class="members-buttons-cell">
	17	+ <% if p.is_admin? %>
	18	+ <%= button_without_text :'reset-admin-role', _('Reset admin role'), :action => 'reset_admin_role', :id => p, :q => @q, :filter => @filter %>
	19	+ <% else %>
	20	+ <%= button_without_text :'set-admin-role', _('Set admin role'), :action => 'set_admin_role', :id => p, :q => @q, :filter => @filter %>
	21	+ <% end %>
	22	+ <% if !p.user.activated? %>
	23	+ <%= button_without_text :'activate-user', _('Activate user'), :action => 'activate', :id => p, :q => @q, :filter => @filter %>
	24	+ <% else %>
	25	+ <%= button_without_text :'deactivate-user', _('Deactivate user'), :action => 'deactivate', :id => p, :q => @q, :filter => @filter %>
	26	+ <% end %>
	27	+ </div>
	28	+ </td>
	29	+ </tr>
	30	+ <% end %>
	31	+</table>
	32	+
	33	+<%= pagination_links @collection, {:param_name => 'npage', :page_links => true} %>
	@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
		1	+ <div class="search-field">
		2	+ <span class="formfield">
		3	+ <%= text_field_tag 'q', @q, :title => _("Find users") %>
		4	+ </span>
		5	+ <%= submit_button(:search, _('Search')) %>
		6	+ </div>
0	\ No newline at end of file	7	\ No newline at end of file
	@@ -4179,6 +4179,33 @@ h1#agenda-title {		@@ -4179,6 +4179,33 @@ h1#agenda-title {
4179	-webkit-border-radius:10px;	4179	-webkit-border-radius:10px;
4180	}	4180	}
4181		4181
		4182	+/* ==> public/stylesheets/controller_environment_users.css <== */
		4183	+.controller-environment_users table {
		4184	+ text-align: left;
		4185	+}
		4186	+
		4187	+#environment-users-search form {
		4188	+ padding: 10px;
		4189	+ margin-bottom: 15px;
		4190	+ background-color: #E6E6E6;
		4191	+ -moz-border-radius: 5px;
		4192	+ -webkit-border-radius: 5px;
		4193	+}
		4194	+
		4195	+.environment-users-results-header {
		4196	+ font-size: 0.9em;
		4197	+ padding: 6px 0px 0px 0px;
		4198	+ margin:0 0 5px 0;
		4199	+ border-bottom: 2px dotted #999;
		4200	+ text-align: right;
		4201	+}
		4202	+#environment-users-filter-title {
		4203	+ font-weight: bold;
		4204	+ font-size: 130%;
		4205	+ line-height: 35px;
		4206	+ float: left;
		4207	+}
		4208	+
4182	/* * * Profile search * * * * * * * */	4209	/* * * Profile search * * * * * * * */
4183		4210
4184	#public-profile-search, #profile-search-results form, .profile-search-block form {	4211	#public-profile-search, #profile-search-results form, .profile-search-block form {
	@@ -6,11 +6,16 @@ class UsersController; def rescue_action(e) raise e end; end		@@ -6,11 +6,16 @@ class UsersController; def rescue_action(e) raise e end; end
6		6
7	class UsersControllerTest < ActionController::TestCase	7	class UsersControllerTest < ActionController::TestCase
8		8
9	- all_fixtures
10	def setup	9	def setup
11	@controller = UsersController.new	10	@controller = UsersController.new
12	@request = ActionController::TestRequest.new	11	@request = ActionController::TestRequest.new
13	@response = ActionController::TestResponse.new	12	@response = ActionController::TestResponse.new
		13	+
		14	+
		15	+ Environment.delete_all
		16	+ Environment.create(:name => 'some env', :is_default => true)
		17	+ admin_user = create_user_with_permission('adminuser', 'manage_environment_users', Environment.default)
		18	+ login_as('adminuser')
14	end	19	end
15		20
16	should 'not access without right permission' do	21	should 'not access without right permission' do
	@@ -28,11 +33,83 @@ class UsersControllerTest < ActionController::TestCase		@@ -28,11 +33,83 @@ class UsersControllerTest < ActionController::TestCase
28	assert_response :success	33	assert_response :success
29	end	34	end
30		35
		36	+ should 'blank search results include activated and deactivated users' do
		37	+ deactivated = create_user('deactivated')
		38	+ deactivated.activated_at = nil
		39	+ deactivated.person.visible = false
		40	+ deactivated.save!
		41	+ get :index, :q => ''
		42	+ assert_tag :tag => 'div', :attributes => { :id => /users-list/ }, :descendant => {:tag => 'a', :attributes => {:title => /adminuser/}}
		43	+ assert_tag :tag => 'div', :attributes => { :id => /users-list/ }, :descendant => {:tag => 'a', :attributes => {:title => /deactivated/}}
		44	+ end
		45	+
		46	+ should 'blank search include all users' do
		47	+ (1..5).each {\|i\|
		48	+ u = create_user('user'+i.to_s)
		49	+ }
		50	+ get :index, :q => '' # blank search
		51	+ assert_tag :tag => 'div', :attributes => { :id => /users-list/ }, :descendant => {:tag => 'a', :attributes => {:title => /adminuser/}}
		52	+ (1..5).each {\|i\|
		53	+ u = 'user'+i.to_s
		54	+ assert_tag :tag => 'div', :attributes => { :id => /users-list/ }, :descendant => {:tag => 'a', :attributes => {:title => u}}
		55	+ }
		56	+ end
		57	+
		58	+ should 'search not include all users' do
		59	+ (1..5).each {\|i\|
		60	+ u = create_user('user'+i.to_s)
		61	+ }
		62	+ get :index, :q => 'er5' # search
		63	+ assert_tag :tag => 'div', :attributes => { :id => /users-list/ }, :descendant => {:tag => 'a', :attributes => {:title => /user5/}}
		64	+ (1..4).each {\|i\|
		65	+ u = 'user'+i.to_s
		66	+ assert_no_tag :tag => 'div', :attributes => { :id => /users-list/ }, :descendant => {:tag => 'a', :attributes => {:title => u}}
		67	+ }
		68	+ end
		69	+
		70	+ should 'set admin role' do
		71	+ u = create_user()
		72	+ assert_equal false, u.person.is_admin?
		73	+ post :set_admin_role, :id => u.person.id, :q => ''
		74	+ u.reload
		75	+ assert u.person.is_admin?
		76	+ end
		77	+
		78	+ should 'reset admin role' do
		79	+ u = create_user()
		80	+ e = Environment.default
		81	+ e.add_admin(u.person)
		82	+ u.reload
		83	+ assert u.person.is_admin?
		84	+ post :reset_admin_role, :id => u.person.id, :q => ''
		85	+ u.reload
		86	+ assert_equal false, u.person.is_admin?
		87	+ end
		88	+
		89	+ should 'activate user' do
		90	+ u = create_user()
		91	+ assert_equal false, u.activated?
		92	+ post :activate, :id => u.person.id, :q => ''
		93	+ u.reload
		94	+ assert u.activated?
		95	+ end
		96	+
		97	+ should 'deactivate user' do
		98	+ u = create_user()
		99	+ u.activated_at = Time.now.utc
		100	+ u.activation_code = nil
		101	+ u.person.visible = true
		102	+ assert u.activated?
		103	+ post :deactivate, :id => u.person.id, :q => ''
		104	+ u.reload
		105	+ assert_equal false, u.activated?
		106	+ end
		107	+
31	should 'response as XML to export users' do	108	should 'response as XML to export users' do
32	admin_user = create_user_with_permission('admin_user', 'manage_environment_users', Environment.default)	109	admin_user = create_user_with_permission('admin_user', 'manage_environment_users', Environment.default)
33	login_as('admin_user')	110	login_as('admin_user')
34		111
35	- get :index, :format => 'xml'	112	+ get :download, :format => 'xml'
36	assert_equal 'text/xml', @response.content_type	113	assert_equal 'text/xml', @response.content_type
37	end	114	end
38		115
	@@ -40,7 +117,7 @@ class UsersControllerTest < ActionController::TestCase		@@ -40,7 +117,7 @@ class UsersControllerTest < ActionController::TestCase
40	admin_user = create_user_with_permission('admin_user', 'manage_environment_users', Environment.default)	117	admin_user = create_user_with_permission('admin_user', 'manage_environment_users', Environment.default)
41	login_as('admin_user')	118	login_as('admin_user')
42		119
43	- get :index, :format => 'csv'	120	+ get :download, :format => 'csv'
44	assert_equal 'text/csv', @response.content_type	121	assert_equal 'text/csv', @response.content_type
45	assert_equal 'name;email', @response.body.split("\n")[0]	122	assert_equal 'name;email', @response.body.split("\n")[0]
46	end	123	end