Author: mzugec Date: Mon Mar 23 21:06:40 2009 New Revision: 56335 URL: http://svn.opensuse.org/viewcvs/yast?rev=56335&view=rev Log: possible to not use LABEL for aliases (bnc#471253) Modified: branches/tmp/SLE-11-SP1-Stash/network/VERSION branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes branches/tmp/SLE-11-SP1-Stash/network/src/lan/virtual.ycp branches/tmp/SLE-11-SP1-Stash/network/src/modules/LanItems.ycp Modified: branches/tmp/SLE-11-SP1-Stash/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/network/VERSION?rev=56335&r1=56334&r2=56335&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/network/VERSION (original) +++ branches/tmp/SLE-11-SP1-Stash/network/VERSION Mon Mar 23 21:06:40 2009 @@ -1 +1 @@ -2.17.78 +2.17.79 Modified: branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes?rev=56335&r1=56334&r2=56335&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes (original) +++ branches/tmp/SLE-11-SP1-Stash/network/package/yast2-network.changes Mon Mar 23 21:06:40 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Mar 23 21:07:22 CET 2009 - mzugec@suse.de + +- possible to not use LABEL for aliases (bnc#471253) +- 2.17.79 + +------------------------------------------------------------------- Mon Mar 23 21:01:15 CET 2009 - mzugec@suse.de - AutoYaST - show Imported settings in UI (bnc#461650) Modified: branches/tmp/SLE-11-SP1-Stash/network/src/lan/virtual.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/network/src/lan/virtual.ycp?rev=56335&r1=56334&r2=56335&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/network/src/lan/virtual.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/network/src/lan/virtual.ycp Mon Mar 23 21:06:40 2009 @@ -60,17 +60,17 @@ void initAdditional (string key) { - //#165059 if (NetworkService::IsManaged()) UI::ChangeWidget(`f_additional, `Enabled, false); list<term> table_items = []; /* make ui items from the aliases list */ maplist(string alias, map data, (map) LanItems::aliases, { + string label = data["LABEL"]:""; string ip = data["IPADDR"]:""; string mask = data["NETMASK"]:""; if (size(data["PREFIXLEN"]:"")>0) mask=sformat("/%1", data["PREFIXLEN"]:""); - table_items = add(table_items, `item(`id(size(table_items)), alias, ip, mask)); + table_items = add(table_items, `item(`id(size(table_items)), label, ip, mask)); }); UI::ChangeWidget(`id(`table), `Items, table_items); @@ -137,10 +137,11 @@ maplist(term e, table_items, { map alias = $[]; alias["IPADDR"] = e[2]:""; + if (size(e[1]:"")>0) alias["LABEL"]=e[1]:""; if(substring(e[3]:"", 0,1)=="/") alias["PREFIXLEN"]=substring(e[3]:"", 1); else alias["NETMASK"]=e[3]:""; - LanItems::aliases[e[1]:""] = alias; - aliases_to_delete[e[1]:""] = nil; + LanItems::aliases[tostring(size(LanItems::aliases))] = alias; +// aliases_to_delete[tostring(size(LanItems::aliases))] = nil; }); foreach (string a, any v, (map )aliases_to_delete, { if (v != nil) { NetworkInterfaces::DeleteAlias (NetworkInterfaces::Name, a); } @@ -205,12 +206,13 @@ UI::SetFocus(`id(`name)); continue; } +/* if(contains(forbidden, val)) { - /* Popup::Error text */ Popup::Error(sformat(_("IP address %1 is already present."), val)); UI::SetFocus(`id(`host)); continue; } +*/ host = add(host, val); val = (string) UI::QueryWidget(`id(`ipaddr), `Value); Modified: branches/tmp/SLE-11-SP1-Stash/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/SLE-11-SP1-Stash/network/src/modules/LanItems.ycp?rev=56335&r1=56334&r2=56335&view=diff ============================================================================== --- branches/tmp/SLE-11-SP1-Stash/network/src/modules/LanItems.ycp (original) +++ branches/tmp/SLE-11-SP1-Stash/network/src/modules/LanItems.ycp Mon Mar 23 21:06:40 2009 @@ -46,6 +46,7 @@ global string type = ""; global string device = ""; +//FIXME: always empty string - remove all occuriences global string alias = ""; global integer current = -1; global string hotplug = ""; @@ -495,8 +496,8 @@ // build aliases overview if (size(NetworkInterfaces::Current["_aliases"]:$[])>0 && !NetworkService::IsManaged()){ foreach(string key, map desc, (map >) NetworkInterfaces::Current["_aliases"]:$[], { - string parameters = sformat(_("IP address: %1, subnet mask %2"), desc["IPADDR"]:"", desc["NETMASK"]:""); - bullets = add(bullets, sformat("%1 (%2)", key, parameters) ); + string parameters = sformat("%1/%2", desc["IPADDR"]:"", desc["PREFIXLEN"]:""); + bullets = add(bullets, sformat("%1 (%2)", desc["LABEL"]:"", parameters) ); }); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org