Merge 1c90edd4c3 into 9cf333eeec

app/controllers/admin/users_controller.rb

@@ -36,6 +36,7 @@ module Admin
 
     def destroy
       @user = User.find(params[:id])
+      @user.events.destroy_all
       @user.destroy
       redirect_to admin_users_path, notice: 'User got deleted'
     end

app/models/user.rb

@@ -16,7 +16,7 @@ class User < ActiveRecord::Base
                   :name, :email_public, :biography, :nickname, :affiliation
 
   has_many :event_users, dependent: :destroy
-  has_many :events, -> { uniq }, through: :event_users
+  has_many :events, -> { uniq }, through: :event_users, dependent: :destroy
   has_many :registrations, dependent: :destroy
   has_many :votes, dependent: :destroy
   has_many :voted_events, through: :votes, source: :events

app/views/admin/users/index.html.haml

@@ -70,7 +70,7 @@
               - if current_user.id == user.id or user.role_ids.include? 3
                 =link_to 'Delete',admin_user_path(user), :method => :delete , :data => {:confirm => 'Are you sure ?'}, :disabled => true,:class => "btn btn-primary disabled btn-danger",:role => "button"
               - else
-                =link_to 'Delete',admin_user_path(user), :method=> :delete , :data=> {:confirm => 'Are you sure ?'},:class => "btn btn-primary btn-danger"
+                =link_to 'Delete',admin_user_path(user), :method=> :delete , :data=> {:confirm => 'Are you sure ?'},:class => "btn btn-primary btn-danger", id: "user-delete-#{user.id}"
 
 
 :javascript