Author: aschnell Date: Tue Jun 17 23:19:46 2008 New Revision: 48373 URL: http://svn.opensuse.org/viewcvs/yast?rev=48373&view=rev Log: - do not hide display name in tables Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/StorageSettings.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/StorageSettings.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/modules/StorageSettings.ycp?rev=48373&r1=48372&r2=48373&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/StorageSettings.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/StorageSettings.ycp Tue Jun 17 23:19:46 2008 @@ -65,8 +65,8 @@ { hidden_fields = new_hidden_fields; - // TODO: during installation? - string tmp = mergestring(maplist(symbol field, hidden_fields, { + // TODO: during installation? + string tmp = mergestring(maplist(symbol field, hidden_fields, { return substring(tostring(field), 1); }), " "); SCR::Write(.sysconfig.storage.DISPLAY_NAME, tmp); @@ -80,7 +80,7 @@ if (tmp == nil) tmp = ""; - hidden_fields = maplist(string field, splitstring(tmp, " \t"), { + hidden_fields = maplist(string field, splitstring(tmp, " \t"), { return symbolof(toterm(tolower(field))); }); } @@ -90,20 +90,25 @@ global list<symbol> FilterTable(list<symbol> fields) { - fields = filter(symbol field, fields, { return !contains(GetHiddenFields(), field); }); + list<symbol> hidden = GetHiddenFields(); if (GetDisplayName() != `path) - fields = filter(symbol field, fields, { return field != `udev_path; }); + hidden = add(hidden, `udev_path); + else + hidden = filter(symbol field, hidden, { return field != `udev_path; }); + if (GetDisplayName() != `id) - fields = filter(symbol field, fields, { return field != `udev_id; }); + hidden = add(hidden, `udev_id); + else + hidden = filter(symbol field, hidden, { return field != `udev_id; }); - return fields; + return filter(symbol field, fields, { return !contains(hidden, field); }); } global list<symbol> FilterOverview(list<symbol> fields) { - fields = filter(symbol field, fields, { return !contains(GetHiddenFields(), field); }); + list<symbol> hidden = GetHiddenFields(); - return fields; + return filter(symbol field, fields, { return !contains(hidden, field); }); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org