diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 6b997dd..6c57367 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -42,11 +42,14 @@ class UsersController < AdminController def deactivate person = environment.people.find(params[:id]) person.user.deactivate + puts "++"*80, person + puts "++"*80, person.user + puts "++"*80, person.user.activated? redirect_to :action => :index, :q => params[:q], :filter => params[:filter] end - def destroy_user() + def destroy_user person = environment.people.find(params[:id]) person.destroy session[:notice] = _('The profile was deleted.') diff --git a/app/views/users/_users_list.rhtml b/app/views/users/_users_list.rhtml index b5715fe..2edd70d 100644 --- a/app/views/users/_users_list.rhtml +++ b/app/views/users/_users_list.rhtml @@ -19,16 +19,18 @@
<% if p.is_admin? %> - <%= button_without_text :'reset-admin-role', _('Reset admin role'), :action => 'reset_admin_role', :id => p, :q => @q, :filter => @filter %> + <%= button_without_text :'reset-admin-role', _('Reset admin role'), {:action => 'reset_admin_role', :id => p, :q => @q}, :filter => @filter, :confirm => "delete_article_message(@article)" %> <% else %> - <%= button_without_text :'set-admin-role', _('Set admin role'), :action => 'set_admin_role', :id => p, :q => @q, :filter => @filter %> + <%= button_without_text :'set-admin-role', _('Set admin role'), {:action => 'set_admin_role', :id => p, :q => @q}, :filter => @filter, :confirm => "delete_article_message(@article)" %> <% end %> <% if !p.user.activated? %> - <%= button_without_text :'activate-user', _('Activate user'), :action => 'activate', :id => p, :q => @q, :filter => @filter %> + <%= button_without_text :'activate-user', _('Activate user'), {:action => 'activate', :id => p, :q => @q}, :filter => @filter, :confirm => "delete_article_message(@article)" %> <% else %> - <%= button_without_text :'deactivate-user', _('Deactivate user'), :action => 'deactivate', :id => p, :q => @q, :filter => @filter %> + <%= button_without_text :'deactivate-user', _('Deactivate user'), {:action => 'deactivate', :id => p, :q => @q}, :filter => @filter, :confirm => "delete_article_message(@article)" %> <% end %> - <%= button_without_text :'ban-user', _('Ban User'), :action => 'destroy_user', :id => p, :q => @q, :filter => @filter %> + + <%= button_without_text :'delete', _('Ban'), {:action => :destroy_user, :id => p, :q => @q}, :filter => @filter, :confirm => "delete_article_message(@article)" %> +
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index e5bfffd..cda9d51 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -4196,6 +4196,11 @@ h1#agenda-title { display: block; float: left; } + +.actions .members-buttons-cell { +width : 100px +} + .controller-profile_members .msie6 .button-bar a { position: relative; } -- libgit2 0.21.2