enable to delete ldap users

diff --git a/vendor/plugins/redmine_le/app/controllers/ldap_users_controller.rb b/vendor/plugins/redmine_le/app/controllers/ldap_users_controller.rb
index 8063d9f..02bd294 100644 (file)
--- a/vendor/plugins/redmine_le/app/controllers/ldap_users_controller.rb
+++ b/vendor/plugins/redmine_le/app/controllers/ldap_users_controller.rb
@@ -60,7 +60,9 @@ class LdapUsersController < ApplicationController
   end\r
 \r
   def destroy\r
-    #@ldap_user = LdapUser.find(params[:id])\r
+    @ldap_user = LdapUser.find(params[:id])\r
+    @ldap_user.destroy unless @ldap_user.nil?\r
+    redirect_to :action => 'index'\r
   end\r
 \r
   private\r

diff --git a/vendor/plugins/redmine_le/app/models/ldap_user.rb b/vendor/plugins/redmine_le/app/models/ldap_user.rb
index 96f3c6e..6eaf8a3 100644 (file)
--- a/vendor/plugins/redmine_le/app/models/ldap_user.rb
+++ b/vendor/plugins/redmine_le/app/models/ldap_user.rb
@@ -95,6 +95,11 @@ class LdapUser < ActiveLdap::Base
     end\r
   end\r
 \r
+  def before_destroy\r
+    u = User.find_by_login(login)\r
+    u.destroy unless u.nil?\r
+  end\r
+\r
   private\r
   def add_error_message(attr, msg, options = {})\r
     @dummy_user ||= User.new\r

diff --git a/vendor/plugins/redmine_le/app/views/ldap_users/index.html.erb b/vendor/plugins/redmine_le/app/views/ldap_users/index.html.erb
index 6396dfe..bc03a1f 100644 (file)
--- a/vendor/plugins/redmine_le/app/views/ldap_users/index.html.erb
+++ b/vendor/plugins/redmine_le/app/views/ldap_users/index.html.erb
@@ -13,6 +13,7 @@
       <th><%= l(:field_firstname) %></th>\r
       <th><%= l(:field_lastname) %></th>\r
       <th><%= l(:field_mail) %></th>\r
+      <th/>\r
     </tr>\r
   </thead>\r
   <tbody>\r
@@ -22,6 +23,7 @@
         <td><%= h(user.firstname) %></td>\r
         <td><%= h(user.lastname) %></td>\r
         <td><%= h(user.mail) %></td>\r
+        <td><%= link_to(l(:button_delete), user, :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del') unless User.current == User.find_by_login(user.login) %></td>\r
       </tr>\r
     <% end %>\r
   </tbody>\r