Merge branch 'users-management'

Rodrigo Souto
2 parents 582c3cb3 9b038076
Showing 23 changed files with 358 additions and 47 deletions Show diff stats
app/controllers/admin/users_controller.rb
app/controllers/application_controller.rb
app/helpers/application_helper.rb
app/helpers/users_helper.rb
app/models/person.rb
app/models/profile.rb
app/models/user.rb
app/views/account/_signup_form.rhtml
app/views/enterprise_registration/basic_information.rhtml
app/views/memberships/new_community.rhtml
app/views/templates/index.html.erb
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/fixtures/profiles.yml
test/functional/users_controller_test.rb
test/unit/application_helper_test.rb
@@ -4,12 +4,52 @@ class UsersController &lt; AdminController
   protect 'manage_environment_users', :environment
+  include UsersHelper
+
   def index
+    @filter = params[:filter]
+    scope = environment.people.no_templates
+    if @filter == 'admin_users'
+      scope = scope.admins
+    elsif @filter == 'activated_users'
+      scope = scope.activated
+    elsif @filter == 'deactivated_users'
+      scope = scope.deactivated
+    end
+    @q = params[:q]
+    @collection = find_by_contents(:people, scope, @q, {:per_page => per_page, :page => params[:npage]})[:results]
+  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] } }),
@@ -45,4 +85,10 @@ class UsersController &lt; AdminController
     end
   end
+  private
+
+  def per_page
+    10
+  end
+
 end
@@ -174,7 +174,7 @@ class ApplicationController &lt; ActionController::Base
   end
   def find_by_contents(asset, scope, query, paginate_options={:page => 1}, options={})
-    @plugins.dispatch_first(:find_by_contents, asset, scope, query, paginate_options, options) ||
+    plugins.dispatch_first(:find_by_contents, asset, scope, query, paginate_options, options) ||
     fallback_find_by_contents(asset, scope, query, paginate_options, options)
   end
@@ -1340,8 +1340,8 @@ module ApplicationHelper
     @plugins.dispatch("content_remove_#{action.to_s}", @page).include?(true)
   end
-  def template_options(klass, field_name)
-    templates = klass.templates(environment)
+  def template_options(kind, field_name)
+    templates = environment.send(kind).templates
     return '' if templates.count == 0
     return hidden_field_tag("#{field_name}[template_id]", templates.first.id) if templates.count == 1
@@ -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
@@ -78,7 +78,8 @@ class Profile &lt; ActiveRecord::Base
   #FIXME: these will work only if the subclass is already loaded
   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 :templates, {:conditions => {:is_template => true}}
+  named_scope :no_templates, {:conditions => {:is_template => false}}
   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
@@ -101,7 +101,7 @@
   <%= @plugins.dispatch(:signup_extra_contents).collect { |content| instance_eval(&content) }.join("") %>
-  <%= template_options(Person, 'profile_data') %>
+  <%= template_options(:people, 'profile_data') %>
   <% unless @terms_of_use.blank? %>
     <div id='terms-of-use-box' class='formfieldline'>
@@ -34,7 +34,7 @@
       <% end %>
     <% end %>
-    <%= template_options(Enterprise, 'create_enterprise')%>
+    <%= template_options(:enterprises, 'create_enterprise')%>
     <% button_bar do %>
       <%= submit_button('next', _('Next'), :cancel => {:profile => current_user.person.identifier, :action=>"enterprises", :controller=>"profile"}) %>
@@ -44,7 +44,7 @@
     </div>
   </div>
-  <%= template_options(Community, 'community')%>
+  <%= template_options(:communities, 'community')%>
   <%= hidden_field_tag('back_to', @back_to) %>
@@ -2,9 +2,9 @@
 <%= _('Manage the templates used on creation of profiles') %>
-<% list_of_templates = [[_('Person')    , Person.templates(environment)    , 'person'    ],
-                        [_('Community') , Community.templates(environment) , 'community' ],
-                        [_('Enterprise'), Enterprise.templates(environment), 'enterprise']] %>
+<% list_of_templates = [[_('Person')    , environment.people.templates     , 'person'    ],
+                        [_('Community') , environment.communities.templates, 'community' ],
+                        [_('Enterprise'), environment.enterprises.templates, 'enterprise']] %>
 <% list_of_templates.each do |title, templates, kind|%>
   <div class='template-kind'>
@@ -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,37 @@
+<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>
+  <colgroup>
+    <col width="80%">
+    <col width="20%">
+  </colgroup>
+  <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 class='actions'>
+        <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) }
@@ -4191,6 +4191,41 @@ h1#agenda-title {
   -webkit-border-radius:10px;
 }
+/* ==> public/stylesheets/controller_environment_users.css <== */
+.controller-users td.actions {
+  text-align: center;
+}
+
+.controller-users .search-field #q {
+  width: 85%;
+}
+
+.controller-users .search-field input[type='submit'] {
+  float: right;
+}
+
+#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 {
@@ -13,12 +13,6 @@ joerandomhacker:
   identifier: joerandomhacker
   environment_id: 1
   user_id: 2
-john_and_joe:
-  id: 3
-  name: "John and Joe's Production Cooperative"
-  type: 'Person'
-  identifier: john_and_joe
-  environment_id: 1
 ze:
   id: 4
   name: "Zé"
@@ -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
@@ -21,26 +23,89 @@ class UsersControllerTest &lt; ActionController::TestCase
   end
   should 'grant access with right permission' do
-    admin_user = create_user_with_permission('admin_user', 'manage_environment_users', Environment.default)
-    login_as('admin_user')
-
     get :index
     assert_response :success
   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')
+  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
+    person = create_user.person
+    assert_equal false, person.is_admin?
+    post :set_admin_role, :id => person.id, :q => ''
+    person.reload
+    assert person.is_admin?
+  end
-    get :index, :format => 'xml'
+  should 'reset admin role' do
+    environment = Environment.default
+    person = create_user.person
+    environment.add_admin(person)
+    assert person.is_admin?
+
+    post :reset_admin_role, :id => person.id, :q => ''
+    person.reload
+    assert !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
+    get :download, :format => 'xml'
     assert_equal 'text/xml', @response.content_type
   end
   should 'response as CSV to export users' do
-    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
@@ -256,7 +256,7 @@ class ApplicationHelperTest &lt; ActiveSupport::TestCase
   should 'not display templates options when there is no template' do
     self.stubs(:environment).returns(Environment.default)
-    [Person, Community, Enterprise].each do |klass|
+    [:people, :communities, :enterprises].each do |klass|
       assert_equal '', template_options(klass, 'profile_data')
     end
   end
@@ -1335,4 +1335,50 @@ 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.activate
+      activated << u.person
+    }
+    (6..10).each {|i|
+      u = create_user('user'+i.to_s)
+      u.deactivate
+    }
+    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.deactivate
+      deactivated << u.person
+    }
+    (6..10).each {|i|
+      u = create_user('user'+i.to_s)
+      u.activate
+    }
+    assert_equal deactivated, Person.deactivated
+  end
 end
@@ -1370,13 +1370,27 @@ class ProfileTest &lt; ActiveSupport::TestCase
   end
   should 'return a list of templates' do
+    environment = Environment.default
     t1 = fast_create(Profile, :is_template => true)
     t2 = fast_create(Profile, :is_template => true)
     profile = fast_create(Profile)
-    assert_includes Profile.templates(Environment.default), t1
-    assert_includes Profile.templates(Environment.default), t2
-    assert_not_includes Profile.templates(Environment.default), profile
+    assert_includes environment.profiles.templates, t1
+    assert_includes environment.profiles.templates, t2
+    assert_not_includes environment.profiles.templates, profile
+  end
+
+  should 'return a list of profiles that are not templates' do
+    environment = Environment.default
+    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 environment.profiles.no_templates, p1
+    assert_includes environment.profiles.no_templates, p2
+    assert_not_includes environment.profiles.no_templates, t1
+    assert_not_includes environment.profiles.no_templates, t2
   end
   should 'not crash on a profile update with a destroyed template' do
@@ -518,6 +518,22 @@ class UserTest &lt; ActiveSupport::TestCase
     end
   end
+  should 'deactivate an user' do
+    user = new_user
+    user.activate
+    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.activate
+    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,52 @@ class UsersController < AdminController		@@ -4,12 +4,52 @@ class UsersController < AdminController
4		4
5	protect 'manage_environment_users', :environment	5	protect 'manage_environment_users', :environment
6		6
		7	+ include UsersHelper
		8	+
7	def index	9	def index
		10	+ @filter = params[:filter]
		11	+ scope = environment.people.no_templates
		12	+ if @filter == 'admin_users'
		13	+ scope = scope.admins
		14	+ elsif @filter == 'activated_users'
		15	+ scope = scope.activated
		16	+ elsif @filter == 'deactivated_users'
		17	+ scope = scope.deactivated
		18	+ end
		19	+ @q = params[:q]
		20	+ @collection = find_by_contents(:people, scope, @q, {:per_page => per_page, :page => params[:npage]})[:results]
		21	+ end
		22	+
		23	+ def set_admin_role
		24	+ person = environment.people.find(params[:id])
		25	+ environment.add_admin(person)
		26	+ redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
		27	+ end
		28	+
		29	+ def reset_admin_role
		30	+ person = environment.people.find(params[:id])
		31	+ environment.remove_admin(person)
		32	+ redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
		33	+ end
		34	+
		35	+ def activate
		36	+ person = environment.people.find(params[:id])
		37	+ person.user.activate
		38	+ redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
		39	+ end
		40	+
		41	+ def deactivate
		42	+ person = environment.people.find(params[:id])
		43	+ person.user.deactivate
		44	+ redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
		45	+ end
		46	+
		47	+ def download
8	respond_to do \|format\|	48	respond_to do \|format\|
9	format.html	49	format.html
10	format.xml do	50	format.xml do
11	- @users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
12	- send_data @users.to_xml(	51	+ users = User.find(:all, :conditions => {:environment_id => environment.id}, :include => [:person])
		52	+ send_data users.to_xml(
13	:skip_types => true,	53	:skip_types => true,
14	:only => %w[email login created_at updated_at],	54	: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] } }),	55	:include => { :person => {:only => %w[name updated_at created_at address birth_date contact_phone identifier lat lng] } }),
	@@ -45,4 +85,10 @@ class UsersController < AdminController		@@ -45,4 +85,10 @@ class UsersController < AdminController
45	end	85	end
46	end	86	end
47		87
		88	+ private
		89	+
		90	+ def per_page
		91	+ 10
		92	+ end
		93	+
48	end	94	end
	@@ -174,7 +174,7 @@ class ApplicationController < ActionController::Base		@@ -174,7 +174,7 @@ class ApplicationController < ActionController::Base
174	end	174	end
175		175
176	def find_by_contents(asset, scope, query, paginate_options={:page => 1}, options={})	176	def find_by_contents(asset, scope, query, paginate_options={:page => 1}, options={})
177	- @plugins.dispatch_first(:find_by_contents, asset, scope, query, paginate_options, options) \|\|	177	+ plugins.dispatch_first(:find_by_contents, asset, scope, query, paginate_options, options) \|\|
178	fallback_find_by_contents(asset, scope, query, paginate_options, options)	178	fallback_find_by_contents(asset, scope, query, paginate_options, options)
179	end	179	end
180		180
@@ -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
	@@ -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
	@@ -101,7 +101,7 @@		@@ -101,7 +101,7 @@
101		101
102	<%= @plugins.dispatch(:signup_extra_contents).collect { \|content\| instance_eval(&content) }.join("") %>	102	<%= @plugins.dispatch(:signup_extra_contents).collect { \|content\| instance_eval(&content) }.join("") %>
103		103
104	- <%= template_options(Person, 'profile_data') %>	104	+ <%= template_options(:people, 'profile_data') %>
105		105
106	<% unless @terms_of_use.blank? %>	106	<% unless @terms_of_use.blank? %>
107	<div id='terms-of-use-box' class='formfieldline'>	107	<div id='terms-of-use-box' class='formfieldline'>
	@@ -34,7 +34,7 @@		@@ -34,7 +34,7 @@
34	<% end %>	34	<% end %>
35	<% end %>	35	<% end %>
36		36
37	- <%= template_options(Enterprise, 'create_enterprise')%>	37	+ <%= template_options(:enterprises, 'create_enterprise')%>
38		38
39	<% button_bar do %>	39	<% button_bar do %>
40	<%= submit_button('next', _('Next'), :cancel => {:profile => current_user.person.identifier, :action=>"enterprises", :controller=>"profile"}) %>	40	<%= submit_button('next', _('Next'), :cancel => {:profile => current_user.person.identifier, :action=>"enterprises", :controller=>"profile"}) %>
	@@ -44,7 +44,7 @@		@@ -44,7 +44,7 @@
44	</div>	44	</div>
45	</div>	45	</div>
46		46
47	- <%= template_options(Community, 'community')%>	47	+ <%= template_options(:communities, 'community')%>
48		48
49	<%= hidden_field_tag('back_to', @back_to) %>	49	<%= hidden_field_tag('back_to', @back_to) %>
50		50
@@ -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,37 @@		@@ -0,0 +1,37 @@
	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	+ <colgroup>
	9	+ <col width="80%">
	10	+ <col width="20%">
	11	+ </colgroup>
	12	+ <tr>
	13	+ <th><%= _('Member') %></th>
	14	+ <th><%= _('Actions') %></th>
	15	+ </tr>
	16	+ <% @collection.each do \|p\| %>
	17	+ <tr title="<%= p.name %>">
	18	+ <td><%= link_to_profile p.short_name, p.identifier, :title => p.name %> </td>
	19	+ <td class='actions'>
	20	+ <div class="members-buttons-cell">
	21	+ <% if p.is_admin? %>
	22	+ <%= button_without_text :'reset-admin-role', _('Reset admin role'), :action => 'reset_admin_role', :id => p, :q => @q, :filter => @filter %>
	23	+ <% else %>
	24	+ <%= button_without_text :'set-admin-role', _('Set admin role'), :action => 'set_admin_role', :id => p, :q => @q, :filter => @filter %>
	25	+ <% end %>
	26	+ <% if !p.user.activated? %>
	27	+ <%= button_without_text :'activate-user', _('Activate user'), :action => 'activate', :id => p, :q => @q, :filter => @filter %>
	28	+ <% else %>
	29	+ <%= button_without_text :'deactivate-user', _('Deactivate user'), :action => 'deactivate', :id => p, :q => @q, :filter => @filter %>
	30	+ <% end %>
	31	+ </div>
	32	+ </td>
	33	+ </tr>
	34	+ <% end %>
	35	+</table>
	36	+
	37	+<%= 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