ref: refs/heads/network
commit 4f0c9414f92b0923c6f143bb0d83a578ec90e4db
Author: Jiri Suchomel
Date: Wed Sep 16 13:41:26 2009 +0200
use NONE value for removing all aliases
---
plugins/administrator/app/models/administrator.rb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugins/administrator/app/models/administrator.rb b/plugins/administrator/app/models/administrator.rb
index 3bc16f9..2327ebe 100644
--- a/plugins/administrator/app/models/administrator.rb
+++ b/plugins/administrator/app/models/administrator.rb
@@ -32,7 +32,7 @@ class Administrator
end
def save_aliases(new_aliases)
- new_aliases = "" if new_aliases.nil?
+ new_aliases = "" if new_aliases.nil? || new_aliases == "NONE"
if @aliases.split(",").sort == new_aliases.split(",").sort
Rails.logger.debug "mail aliases have not been changed"
return
@@ -53,7 +53,7 @@ class Administrator
xml.administrator do
xml.password password
- xml.aliases aliases, {:type => "string"}
+ xml.aliases aliases
end
end
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
