Author: aschnell Date: Mon Jun 9 14:39:10 2008 New Revision: 48166 URL: http://svn.opensuse.org/viewcvs/yast?rev=48166&view=rev Log: - fixed displaying of udev id Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp?rev=48166&r1=48165&r2=48166&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/StorageFields.ycp Mon Jun 9 14:39:10 2008 @@ -19,6 +19,20 @@ import "HTML"; + // like the Python builtin + list<integer> range(integer n) + { + list<integer> ret = []; + integer i = 0; + while (i < n) + { + ret = add(ret, i); + i = i + 1; + } + return ret; + } + + global list<symbol> Filter(list<symbol> fields) { if (Arch::ppc()) @@ -381,15 +395,10 @@ if (style == `table) { return data["udev_id", 0]:""; } else { - string ret = ""; - integer i = 1; - foreach(string id, data["udev_id"]:[""], { - if (i > 1) - ret = ret + HTML::Newline(); - ret = ret + sformat(_("ID %1: %2"), i, id); - i = i + 1; - }); - return ret; + integer n = size(data["udev_id"]:[]); + return mergestring(maplist(integer i, range(n == 0 ? 1 : n), { + return sformat(_("ID %1: %2"), i+1, data["udev_id", i]:""); + }), HTML::Newline()); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org