ref: refs/heads/network commit a014f13592c32c3b21df73ee77dd266ac1974850 Author: Michal Zugec Date: Thu Oct 1 16:13:21 2009 +0200 show error message given from YaPI in routing --- .../network/app/controllers/network_controller.rb | 13 ++++++++++--- .../package/yast2-webclient-network.changes | 5 +++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/plugins/network/app/controllers/network_controller.rb b/plugins/network/app/controllers/network_controller.rb index a20d40d..58e8632 100644 --- a/plugins/network/app/controllers/network_controller.rb +++ b/plugins/network/app/controllers/network_controller.rb @@ -96,14 +96,21 @@ class NetworkController < ApplicationController end begin + # this is not transaction! + # if any *.save failed, the previous will be applied rt.save dns.save hn.save ifc.save flash[:notice] = _('Settings have been written.') - rescue ActiveResource::ClientError => e - flash[:error] = YaST::ServiceResource.error(e) - logger.warn e + rescue ActiveResource::ServerError => e + response = Hash.from_xml(e.response.body) + if ( response["error"] && response["error"]["type"]=="NETWORK_ROUTE_ERROR") + flash[:error] = response["error"]["description"] + logger.warn e + else + throw e + end rescue Exception => e flash[:error] = e.message logger.warn e diff --git a/plugins/network/package/yast2-webclient-network.changes b/plugins/network/package/yast2-webclient-network.changes index 6db499c..02ff851 100644 --- a/plugins/network/package/yast2-webclient-network.changes +++ b/plugins/network/package/yast2-webclient-network.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Oct 1 16:11:57 CEST 2009 - mzugec@suse.cz + +- show error message given from YaPI in routing + +------------------------------------------------------------------- Tue Sep 29 12:29:14 CEST 2009 - schubi@suse.de - version 0.0.4 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org