Author: mzugec Date: Mon Mar 2 13:52:14 2009 New Revision: 55843 URL: http://svn.opensuse.org/viewcvs/yast?rev=55843&view=rev Log: possible to not use LABEL for aliases (bnc#471253) Modified: branches/SuSE-SLE-10-SP3-Branch/network/VERSION branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes branches/SuSE-SLE-10-SP3-Branch/network/src/lan/virtual.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/network/VERSION?rev=55843&r1=55842&r2=55843&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/network/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/network/VERSION Mon Mar 2 13:52:14 2009 @@ -1 +1 @@ -2.13.123 +2.13.124 Modified: branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes?rev=55843&r1=55842&r2=55843&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes Mon Mar 2 13:52:14 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Mar 2 13:49:32 CET 2009 - mzugec@suse.de + +- possible to not use LABEL for aliases (bnc#471253) +- 2.14.124 + +------------------------------------------------------------------- Thu Feb 19 09:10:00 CET 2009 - mzugec@suse.cz - removed "no network running" popup, log only (bnc#475440) Modified: branches/SuSE-SLE-10-SP3-Branch/network/src/lan/virtual.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/network/src/lan/virtual.ycp?rev=55843&r1=55842&r2=55843&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/network/src/lan/virtual.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/network/src/lan/virtual.ycp Mon Mar 2 13:52:14 2009 @@ -90,7 +90,6 @@ /* Aliases dialog help 3/3, #83766 */ _("<p>Do not include the interface name in the alias name. For example, enter <b>foo</b> instead of <b>eth0:foo</b>.</p>"); - integer items = 0; integer max = 0; list<term> table_items = []; @@ -98,14 +97,13 @@ maplist(string alias, map data, (map) Lan::aliases, { string ipaddr = data["IPADDR"]:""; string netmask = data["NETMASK"]:""; - term item = `item(`id(items), alias, ipaddr, netmask); + string label = data["LABEL"]:""; + term item = `item(`id(size(table_items)), label, ipaddr, netmask); table_items = add(table_items, item); - items = items + 1; }); y2debug("table_items=%1", table_items); - y2debug("items=%1", items); - max = items; + max = size(table_items); /* Aliases dialog contents */ term contents = `HBox( @@ -144,13 +142,13 @@ Label::BackButton(), Label::OKButton()); UI::ChangeWidget(`id(`table), `Items, table_items); - if(items > 0) UI::SetFocus(`id(`table)); + if(size(table_items) > 0) UI::SetFocus(`id(`table)); any ret = nil; while(true) { - UI::ChangeWidget(`id(`edit), `Enabled, items > 0); - UI::ChangeWidget(`id(`delete), `Enabled, items > 0); + UI::ChangeWidget(`id(`edit), `Enabled, size(table_items) > 0); + UI::ChangeWidget(`id(`delete), `Enabled, size(table_items) > 0); ret = UI::UserInput(); y2milestone("ret=%1", ret); @@ -199,7 +197,6 @@ table_items = add(table_items, item); UI::ChangeWidget(`id(`table), `Items, table_items); UI::ChangeWidget(`id(`table), `CurrentItem, max); - items = items + 1; max = max + 1; continue; } @@ -216,7 +213,6 @@ return cur != e[0, 0]:nil; }); UI::ChangeWidget(`id(`table), `Items, table_items); - items = size(table_items); continue; } else if(ret == `back) { @@ -238,10 +234,11 @@ Lan::aliases = $[]; maplist(term e, table_items, { map alias = $[]; + if (size(e[1]:"")>0) alias["LABEL"]=e[1]:""; alias["IPADDR"] = e[2]:""; alias["NETMASK"] = e[3]:""; - Lan::aliases[e[1]:""] = alias; - aliases_to_delete[e[1]:""] = nil; + Lan::aliases[tostring(size(Lan::aliases))] = alias; +// aliases_to_delete[e[1]:""] = nil; }); foreach (string a, any v, (map )aliases_to_delete, { if (v != nil) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org