Author: locilka Date: Mon Feb 8 15:26:10 2010 New Revision: 60734 URL: http://svn.opensuse.org/viewcvs/yast?rev=60734&view=rev Log: - Showing also zone of interface for 'Open Port in Firewall' details (BNC #483455). - 2.19.6 Modified: trunk/yast2/VERSION trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=60734&r1=60733&r2=60734&view=diff ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Mon Feb 8 15:26:10 2010 @@ -1 +1 @@ -2.19.5 +2.19.6 Modified: trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp?rev=60734&r1=60733&r2=60734&view=diff ============================================================================== --- trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp (original) +++ trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp Mon Feb 8 15:26:10 2010 @@ -153,6 +153,18 @@ interface_items = maplist (string i, all_interfaces, { string label = NetworkInterfaces::GetValue (i, "BOOTPROTO"); string ipaddr = NetworkInterfaces::GetValue (i, "IPADDR"); + + // BNC #483455: Interface zone name + string zone = SuSEFirewall::GetZoneOfInterface (i); + if (zone != nil && zone != "") + { + zone = SuSEFirewall::GetZoneFullName (zone); + } + else + { + zone = _("Interface is not assigned to any zone"); + } + if (label == "static" || label == "" || label == nil) { label = ipaddr; @@ -163,14 +175,16 @@ if (ipaddr != nil && ipaddr != "") label = sformat ("%1/%2", label, ipaddr); } + if (label == nil || label == "") { label = i; } else { - label = sformat ("%1 (%2)", i, label); + label = sformat ("%1 (%2 / %3)", i, label, zone); } + return `item (`id (i), label); }); } Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=60734&r1=60733&r2=60734&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Mon Feb 8 15:26:10 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Feb 8 15:23:54 CET 2010 - locilka@suse.cz + +- Showing also zone of interface for 'Open Port in Firewall' + details (BNC #483455). +- 2.19.6 + +------------------------------------------------------------------- Tue Feb 2 17:20:29 CET 2010 - locilka@suse.cz - Fixed generating unique step IDs for Wizard too keep the same -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org