Merged r9417 from trunk (#10664).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9455 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-20 07:45:33 +00:00
parent da1a3449ce
commit e5802895ce
14 changed files with 133 additions and 8 deletions
@@ -486,6 +486,12 @@ class User < Principal
    allowed_to?(action, nil, options.reverse_merge(:global => true), &block)
  end

+  # Returns true if the user is allowed to delete his own account
+  def own_account_deletable?
+    Setting.unsubscribe? &&
+      (!admin? || User.active.first(:conditions => ["admin = ? AND id <> ?", true, id]).present?)
+  end
+
  safe_attributes 'login',
    'firstname',
    'lastname',