Download as
Browse Code »

Commit 377d910bc1bb9e08e573ad590b7a87b9556976e2

Authored by David Silva
Committed by Gust
1 parent d0561132
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ban_user: Creating ban button and ban method in user controller 

(ActionItemAI3021)

Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
Showing 2 changed files with 12 additions and 2 deletions   Show diff stats
app/controllers/admin/users_controller.rb
  Diff comments   View file @377d910
@@ -45,6 +45,15 @@ class UsersController &lt; AdminController @@ -45,6 +45,15 @@ class UsersController &lt; AdminController
45 redirect_to :action => :index, :q => params[:q], :filter => params[:filter] 45 redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
46 end 46 end
47 47
  48 +
  49 + def destroy_user()
  50 + person = environment.people.find(params[:id])
  51 + person.destroy
  52 + session[:notice] = _('The profile was deleted.')
  53 + redirect_to :action => :index, :q => params[:q], :filter => params[:filter]
  54 + end
  55 +
  56 +
48 def download 57 def download
49 respond_to do |format| 58 respond_to do |format|
50 format.html 59 format.html
@@ -86,7 +95,7 @@ class UsersController &lt; AdminController @@ -86,7 +95,7 @@ class UsersController &lt; AdminController
86 end 95 end
87 end 96 end
88 97
89 - private 98 + private
90 99
91 def per_page 100 def per_page
92 10 101 10
app/views/users/_users_list.rhtml
  Diff comments   View file @377d910
@@ -28,7 +28,8 @@ @@ -28,7 +28,8 @@
28 <% else %> 28 <% else %>
29 <%= button_without_text :'deactivate-user', _('Deactivate user'), :action => 'deactivate', :id => p, :q => @q, :filter => @filter %> 29 <%= button_without_text :'deactivate-user', _('Deactivate user'), :action => 'deactivate', :id => p, :q => @q, :filter => @filter %>
30 <% end %> 30 <% end %>
31 - </div> 31 + <%= button_without_text :'ban-user', _('Ban User'), :action => 'destroy_user', :id => p, :q => @q, :filter => @filter %>
  32 + </div>
32 </td> 33 </td>
33 </tr> 34 </tr>
34 <% end %> 35 <% end %>