[yast-commit] r48488 - /branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-dialogs.ycp

Author: aschnell Date: Mon Jun 23 15:33:16 2008 New Revision: 48488 URL: http://svn.opensuse.org/viewcvs/yast?rev=48488&view=rev Log: - fixed devices list for new raids Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-dialogs.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-dialogs.ycp?rev=48488&r1=48487&r2=48488&view=diff ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-dialogs.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid-dialogs.ycp Mon Jun 23 15:33:16 2008 @@ -13,15 +13,18 @@ y2milestone("MiniWorkflowStepRaidTypeDevices data:%1", data); symbol raid_type = data["raid_type"]:`raid0; - - list<string> devices = []; // TODO + string device = data["device"]:"error"; + list<string> devices = data["devices"]:[]; list<symbol> fields = StorageSettings::FilterTable([ `device, `udev_path, `udev_id, `size ]); map target_map = Storage::GetTargetMap(); - list<map> free_devices = filter(map device, get_possible_rds(target_map), { return device["used_by"]:"" == ""; }); + list<map> free_devices = filter(map dev, get_possible_rds(target_map), { return dev["used_by"]:"" == "" && + !contains(devices, dev["device"]:""); }); + list<map> used_devices = filter(map dev, get_possible_rds(target_map), { return dev["used_by"]:"" == "" && + contains(devices, dev["device"]:""); }); term contents = `VBox( @@ -44,7 +47,7 @@ ))) ); - contents = add(contents, DevicesSelectionBox::Create(free_devices, [], fields, + contents = add(contents, DevicesSelectionBox::Create(free_devices, used_devices, fields, _("Available Devices:"), _("Selected Devices:"))); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org