Author: mzugec Date: Mon May 24 15:04:37 2010 New Revision: 62058 URL: http://svn.opensuse.org/viewcvs/yast?rev=62058&view=rev Log: summary overview for autoyast (bnc#581682) Modified: trunk/iscsi-client/VERSION trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/IscsiClient.ycp trunk/iscsi-client/src/IscsiClientLib.ycp Modified: trunk/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=62058&r1=62057&r2=62058&view=diff ============================================================================== --- trunk/iscsi-client/VERSION (original) +++ trunk/iscsi-client/VERSION Mon May 24 15:04:37 2010 @@ -1 +1 @@ -2.19.5 +2.19.6 Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi-client.changes?rev=62058&r1=62057&r2=62058&view=diff ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Mon May 24 15:04:37 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 24 15:03:36 CEST 2010 - mzugec@suse.cz + +- summary overview for autoyast (bnc#581682) +- 2.19.6 + +------------------------------------------------------------------- Tue May 11 13:48:12 CEST 2010 - mzugec@suse.cz - delete discovered targets (bnc#602108) Modified: trunk/iscsi-client/src/IscsiClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClient.ycp?rev=62058&r1=62057&r2=62058&view=diff ============================================================================== --- trunk/iscsi-client/src/IscsiClient.ycp (original) +++ trunk/iscsi-client/src/IscsiClient.ycp Mon May 24 15:04:37 2010 @@ -119,14 +119,14 @@ else new_target = union(new_target, auth); tgets = add(tgets, new_target); }); - map result = $[ + IscsiClientLib::ay_settings = $[ "version" : "1.0", "initiatorname" : IscsiClientLib::initiatorname, "targets" : tgets ]; configured = true; modified = true; - return result; + return IscsiClientLib::ay_settings; } /** @@ -277,7 +277,7 @@ global list Summary() { // TODO FIXME: your code here... /* Configuration summary text for autoyast */ - return [ _("Configuration summary..."), [] ]; + return [ IscsiClientLib::Overview(), [] ]; } /** Modified: trunk/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.ycp?rev=62058&r1=62057&r2=62058&view=diff ============================================================================== --- trunk/iscsi-client/src/IscsiClientLib.ycp (original) +++ trunk/iscsi-client/src/IscsiClientLib.ycp Mon May 24 15:04:37 2010 @@ -526,5 +526,18 @@ return true; } +global string Overview(){ + string overview = _("Configuration summary..."); + if (size(ay_settings)>0){ + overview=""; + if (size(ay_settings["initiatorname"]:"")>0) overview = overview + "<p><b>Initiatorname: </b>" + ay_settings["initiatorname"]:"" + "</p>"; + if (size(ay_settings["targets"]:[])>0){ + foreach(map target, (list<map>)ay_settings["targets"]:[], { + overview = overview + "<p>" + target["portal"]:"" + ", " + target["target"]:"" + ", " + target["startup"]:"" + "</p>"; + }); + } + } + return overview; +} } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org