ref: refs/heads/master
commit 62e08a9d0ffdf7fb1a1e1598feefe269c385747a
Author: Jiri Suchomel
Date: Mon Nov 2 15:26:35 2009 +0100
- do not dasherize underscores (bnc#551284)
---
.../app/controllers/mail_settings_controller.rb | 8 ++++++--
.../package/yast2-webservice-mailsettings.changes | 6 ++++++
.../package/yast2-webservice-mailsettings.spec | 2 +-
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/plugins/mail_settings/app/controllers/mail_settings_controller.rb b/plugins/mail_settings/app/controllers/mail_settings_controller.rb
index d009176..f120fb2 100644
--- a/plugins/mail_settings/app/controllers/mail_settings_controller.rb
+++ b/plugins/mail_settings/app/controllers/mail_settings_controller.rb
@@ -14,7 +14,7 @@ class MailSettingsController < ApplicationController
@mail.read
respond_to do |format|
- format.xml { render :xml => @mail.to_xml(:root => "mail_settings", :indent=>2), :location => "none" }
+ format.xml { render :xml => @mail.to_xml(:root => "mail_settings", :dasherize => false, :indent=>2), :location => "none" }
format.json { render :json => @mail.to_json, :location => "none" }
end
end
@@ -27,7 +27,11 @@ class MailSettingsController < ApplicationController
@mail = MailSettings.instance
@mail.read
- @mail.save(params["mail_settings"])
+ if params.has_key? "mail_settings"
+ @mail.save(params["mail_settings"])
+ else
+ logger.warn "mail_settings hash missing in request"
+ end
show
end
diff --git a/plugins/mail_settings/package/yast2-webservice-mailsettings.changes b/plugins/mail_settings/package/yast2-webservice-mailsettings.changes
index f56640c..46838d3 100644
--- a/plugins/mail_settings/package/yast2-webservice-mailsettings.changes
+++ b/plugins/mail_settings/package/yast2-webservice-mailsettings.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Oct 30 15:15:30 CET 2009 - jsuchome@suse.cz
+
+- do not dasherize underscores (bnc#551284)
+- 0.0.7
+
+-------------------------------------------------------------------
Fri Oct 30 08:04:05 CET 2009 - lslezak@suse.cz
- fixed restdoc packaging
diff --git a/plugins/mail_settings/package/yast2-webservice-mailsettings.spec b/plugins/mail_settings/package/yast2-webservice-mailsettings.spec
index 056d75c..060ba55 100644
--- a/plugins/mail_settings/package/yast2-webservice-mailsettings.spec
+++ b/plugins/mail_settings/package/yast2-webservice-mailsettings.spec
@@ -15,7 +15,7 @@ Provides: yast2-webservice:/srv/www/yastws/app/controllers/mail_settings_c
License: GPLv2
Group: Productivity/Networking/Web/Utilities
Autoreqprov: on
-Version: 0.0.6
+Version: 0.0.7
Release: 0
Summary: YaST2 - Webservice - Mail Settings
Source: www.tar.bz2
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
