diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/users_controller.rb | 13 | ||||
| -rw-r--r-- | app/views/users/edit.rhtml | 1 | ||||
| -rw-r--r-- | app/views/users/index.rhtml | 5 |
3 files changed, 16 insertions, 3 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 2a213f5e8..c7f9dcf1b 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -19,8 +19,8 @@ class UsersController < ApplicationController layout 'admin' before_filter :require_admin, :except => :show - before_filter :find_user, :only => [:show, :edit, :update, :edit_membership, :destroy_membership] - accept_key_auth :index, :show, :create, :update + before_filter :find_user, :only => [:show, :edit, :update, :destroy, :edit_membership, :destroy_membership] + accept_key_auth :index, :show, :create, :update, :destroy helper :sort include SortHelper @@ -177,6 +177,15 @@ class UsersController < ApplicationController redirect_to :controller => 'users', :action => 'edit', :id => @user end + verify :method => :delete, :only => :destroy, :render => {:nothing => true, :status => :method_not_allowed } + def destroy + @user.destroy + respond_to do |format| + format.html { redirect_to(users_url) } + format.api { head :ok } + end + end + def edit_membership @membership = Member.edit_membership(params[:membership_id], params[:membership], @user) @membership.save if request.post? diff --git a/app/views/users/edit.rhtml b/app/views/users/edit.rhtml index 0d9cb0133..0c5883e8b 100644 --- a/app/views/users/edit.rhtml +++ b/app/views/users/edit.rhtml @@ -1,6 +1,7 @@ <div class="contextual"> <%= link_to l(:label_profile), user_path(@user), :class => 'icon icon-user' %> <%= change_status_link(@user) %> +<%= link_to(l(:button_delete), @user, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del') if User.current != @user %> </div> <h2><%= link_to l(:label_user_plural), :controller => 'users', :action => 'index' %> » <%=h @user.login %></h2> diff --git a/app/views/users/index.rhtml b/app/views/users/index.rhtml index 69ad73747..07308265e 100644 --- a/app/views/users/index.rhtml +++ b/app/views/users/index.rhtml @@ -37,7 +37,10 @@ <td align="center"><%= checked_image user.admin? %></td> <td class="created_on" align="center"><%= format_time(user.created_on) %></td> <td class="last_login_on" align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td> - <td><small><%= change_status_link(user) %></small></td> + <td class="buttons"> + <%= change_status_link(user) %> + <%= link_to(l(:button_delete), user, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del') unless User.current == user %> + </td> </tr> <% end -%> </tbody> |