Allow admins to activate and deactivate environment users.

Eduardo Tourinho Edington
1 parent d09c5df5
Showing 18 changed files with 320 additions and 220 deletions Show diff stats
app/controllers/admin/environment_users_controller.rb
app/controllers/admin/users_controller.rb
app/controllers/admin/xxx-environment_users_controller.rb
app/controllers/application_controller.rb
app/helpers/users_helper.rb
app/models/person.rb
app/views/environment_users/_environment_users_search_form.rhtml
app/views/environment_users/_index_buttons.rhtml
app/views/environment_users/_users_list.rhtml
app/views/environment_users/index.rhtml
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/stylesheets/application.css
test/functional/environment_users_controller_test.rb
test/functional/users_controller_test.rb
test/unit/person_test.rb
@@ -1,44 +0,0 @@
-class EnvironmentUsersController < AdminController
-
-  protect 'manage_environment_users', :environment
-
-  def per_page
-    10
-  end
-
-  def index
-    @q = params[:q]
-    if @q.blank?
-      @collection = environment.people.no_templates(environment).paginate(
-        :per_page => per_page,
-        :page => params[:npage]
-      )
-    else
-      @collection = find_by_contents(:people, environment.people.no_templates(environment), @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]
-  end
-
-  def reset_admin_role
-    @person = environment.people.find(params[:id])
-    environment.remove_admin(@person)
-    redirect_to :action => :index, :q => params[:q]
-  end
-
-  def activate
-    @person = environment.people.find(params[:id])
-    @person.user.activate
-    redirect_to :action => :index, :q => params[:q]
-  end
-
-  def deactivate
-    @person = environment.people.find(params[:id])
-    @person.user.deactivate
-    redirect_to :action => :index, :q => params[:q]
-  end
-end
@@ -4,7 +4,57 @@ 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
@@ -0,0 +1,44 @@
+class EnvironmentUsersController < AdminController
+
+  protect 'manage_environment_users', :environment
+
+  def per_page
+    10
+  end
+
+  def index
+    @q = params[:q]
+    if @q.blank?
+      @collection = environment.people.no_templates(environment).paginate(
+        :per_page => per_page,
+        :page => params[:npage]
+      )
+    else
+      @collection = find_by_contents(:people, environment.people.no_templates(environment), @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]
+  end
+
+  def reset_admin_role
+    @person = environment.people.find(params[:id])
+    environment.remove_admin(@person)
+    redirect_to :action => :index, :q => params[:q]
+  end
+
+  def activate
+    @person = environment.people.find(params[:id])
+    @person.user.activate
+    redirect_to :action => :index, :q => params[:q]
+  end
+
+  def deactivate
+    @person = environment.people.find(params[:id])
+    @person.user.deactivate
+    redirect_to :action => :index, :q => params[:q]
+  end
+end
@@ -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
@@ -1,8 +0,0 @@
-<% form_tag( { :controller => 'environment_users', :action => 'index' }, :method => 'get', :class => 'environment-users-search' ) do %>
-  <div class="search-field">
-    <span class="formfield">
-      <%= text_field_tag 'q', @q, :title => _("Find users") %>
-    </span>
-    <%= submit_button(:search, _('Search')) %>
-  </div>
-<% end %>
@@ -1,3 +0,0 @@
-<% button_bar do %>
-  <%= button :back, _('Back'), :controller => 'users' %>
-<% end %>
@@ -1,30 +0,0 @@
-<% title = _('All Users') %>
-
-<h3><%= title %></h3>
-<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 %>
-          	<% else %>
-          	<%= button_without_text :'set-admin-role', _('Set admin role'), :action => 'set_admin_role', :id => p, :q => @q %>
-          	<% end %>
-        	<% if !p.user.activated? %>
-          	<%= button_without_text :'activate-user', _('Activate user'), :action => 'activate', :id => p, :q => @q %>
-          	<% else %>
-          	<%= button_without_text :'deactivate-user', _('Deactivate user'), :action => 'deactivate', :id => p, :q => @q %>
-          	<% end %>
-        </div>
-      </td>
-    </tr>
-  <% end %>
-</table>
-
-<%= pagination_links @collection, {:param_name => 'npage', :page_links => true} %>
 \ No newline at end of file
@@ -1,12 +0,0 @@
-<h1><%= _('Edit Users')%></h1>
-
-<%= render :partial => 'index_buttons' %>
-
-<div id="search-users">
-  <%= render :partial => 'environment_users_search_form' %>
-</div>
-<div id="users-list">
-  <%= render :partial => 'users_list' %>
-</div>
-
-<%= render :partial => 'index_buttons' %>
@@ -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} %>
 \ No newline at end of file
@@ -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>
-  <li>
-  	<%= link_to _('Edit users'), :controller => 'environment_users' %>
-  </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
@@ -4150,6 +4150,19 @@ h1#agenda-title {
   -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 * * * * * * * */
@@ -1,103 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require 'environment_users_controller'
-
-# Re-raise errors caught by the controller.
-class EnvironmentUsersController; def rescue_action(e) raise e end; end
-
-class EnvironmentUsersControllerTest < ActionController::TestCase
-
-  # all_fixtures
-  def setup
-    @controller = EnvironmentUsersController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-
-    admin_user = create_user_with_permission('adminuser', 'manage_environment_users', Environment.default)
-    login_as('adminuser')
-  end
-
-  should 'not access without right permission' do
-    guest = create_user('guest')
-    login_as 'guest'
-
-    get :index
-    assert_response 403 # forbidden
-  end
-
-  should 'grant access with right permission' do
-    get :index
-    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
-end
@@ -6,11 +6,13 @@ 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
+
+    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 +30,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 +114,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
	@@ -1,44 +0,0 @@	@@ -1,44 +0,0 @@
1	-class EnvironmentUsersController < AdminController
2	-
3	- protect 'manage_environment_users', :environment
4	-
5	- def per_page
6	- 10
7	- end
8	-
9	- def index
10	- @q = params[:q]
11	- if @q.blank?
12	- @collection = environment.people.no_templates(environment).paginate(
13	- :per_page => per_page,
14	- :page => params[:npage]
15	- )
16	- else
17	- @collection = find_by_contents(:people, environment.people.no_templates(environment), @q, {:per_page => per_page, :page => params[:npage]})[:results]
18	- end
19	- end
20	-
21	- def set_admin_role
22	- @person = environment.people.find(params[:id])
23	- environment.add_admin(@person)
24	- redirect_to :action => :index, :q => params[:q]
25	- end
26	-
27	- def reset_admin_role
28	- @person = environment.people.find(params[:id])
29	- environment.remove_admin(@person)
30	- redirect_to :action => :index, :q => params[:q]
31	- end
32	-
33	- def activate
34	- @person = environment.people.find(params[:id])
35	- @person.user.activate
36	- redirect_to :action => :index, :q => params[:q]
37	- end
38	-
39	- def deactivate
40	- @person = environment.people.find(params[:id])
41	- @person.user.deactivate
42	- redirect_to :action => :index, :q => params[:q]
43	- end
44	-end
	@@ -4,7 +4,57 @@ class UsersController < AdminController		@@ -4,7 +4,57 @@ 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
@@ -0,0 +1,44 @@		@@ -0,0 +1,44 @@
	1	+class EnvironmentUsersController < AdminController
	2	+
	3	+ protect 'manage_environment_users', :environment
	4	+
	5	+ def per_page
	6	+ 10
	7	+ end
	8	+
	9	+ def index
	10	+ @q = params[:q]
	11	+ if @q.blank?
	12	+ @collection = environment.people.no_templates(environment).paginate(
	13	+ :per_page => per_page,
	14	+ :page => params[:npage]
	15	+ )
	16	+ else
	17	+ @collection = find_by_contents(:people, environment.people.no_templates(environment), @q, {:per_page => per_page, :page => params[:npage]})[:results]
	18	+ end
	19	+ end
	20	+
	21	+ def set_admin_role
	22	+ @person = environment.people.find(params[:id])
	23	+ environment.add_admin(@person)
	24	+ redirect_to :action => :index, :q => params[:q]
	25	+ end
	26	+
	27	+ def reset_admin_role
	28	+ @person = environment.people.find(params[:id])
	29	+ environment.remove_admin(@person)
	30	+ redirect_to :action => :index, :q => params[:q]
	31	+ end
	32	+
	33	+ def activate
	34	+ @person = environment.people.find(params[:id])
	35	+ @person.user.activate
	36	+ redirect_to :action => :index, :q => params[:q]
	37	+ end
	38	+
	39	+ def deactivate
	40	+ @person = environment.people.find(params[:id])
	41	+ @person.user.deactivate
	42	+ redirect_to :action => :index, :q => params[:q]
	43	+ end
	44	+end
	@@ -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
	@@ -1,8 +0,0 @@	@@ -1,8 +0,0 @@
1	-<% form_tag( { :controller => 'environment_users', :action => 'index' }, :method => 'get', :class => 'environment-users-search' ) do %>
2	- <div class="search-field">
3	- <span class="formfield">
4	- <%= text_field_tag 'q', @q, :title => _("Find users") %>
5	- </span>
6	- <%= submit_button(:search, _('Search')) %>
7	- </div>
8	-<% end %>
	@@ -1,3 +0,0 @@	@@ -1,3 +0,0 @@
1	-<% button_bar do %>
2	- <%= button :back, _('Back'), :controller => 'users' %>
3	-<% end %>
	@@ -1,30 +0,0 @@		@@ -1,30 +0,0 @@
1	-<% title = _('All Users') %>
2	-
3	-<h3><%= title %></h3>
4	-<table>
5	- <tr>
6	- <th><%= _('Member') %></th>
7	- <th><%= _('Actions') %></th>
8	- </tr>
9	- <% @collection.each do \|p\| %>
10	- <tr title="<%= p.name %>">
11	- <td><%= link_to_profile p.short_name, p.identifier, :title => p.name %> </td>
12	- <td>
13	- <div class="members-buttons-cell">
14	- <% if p.is_admin? %>
15	- <%= button_without_text :'reset-admin-role', _('Reset admin role'), :action => 'reset_admin_role', :id => p, :q => @q %>
16	- <% else %>
17	- <%= button_without_text :'set-admin-role', _('Set admin role'), :action => 'set_admin_role', :id => p, :q => @q %>
18	- <% end %>
19	- <% if !p.user.activated? %>
20	- <%= button_without_text :'activate-user', _('Activate user'), :action => 'activate', :id => p, :q => @q %>
21	- <% else %>
22	- <%= button_without_text :'deactivate-user', _('Deactivate user'), :action => 'deactivate', :id => p, :q => @q %>
23	- <% end %>
24	- </div>
25	- </td>
26	- </tr>
27	- <% end %>
28	-</table>
29	-
30	-<%= pagination_links @collection, {:param_name => 'npage', :page_links => true} %>
31	\ No newline at end of file	0	\ No newline at end of file
	@@ -1,12 +0,0 @@	@@ -1,12 +0,0 @@
1	-<h1><%= _('Edit Users')%></h1>
2	-
3	-<%= render :partial => 'index_buttons' %>
4	-
5	-<div id="search-users">
6	- <%= render :partial => 'environment_users_search_form' %>
7	-</div>
8	-<div id="users-list">
9	- <%= render :partial => 'users_list' %>
10	-</div>
11	-
12	-<%= render :partial => 'index_buttons' %>
@@ -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 %>