Author: aschnell Date: Thu Mar 18 15:06:54 2010 New Revision: 61385 URL: http://svn.opensuse.org/viewcvs/yast?rev=61385&view=rev Log: - fixed and improved use of proposal_name Modified: trunk/storage/storage/src/inst_target_selection.ycp Modified: trunk/storage/storage/src/inst_target_selection.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_target_selection.ycp?rev=61385&r1=61384&r2=61385&view=diff ============================================================================== --- trunk/storage/storage/src/inst_target_selection.ycp (original) +++ trunk/storage/storage/src/inst_target_selection.ycp Thu Mar 18 15:06:54 2010 @@ -70,14 +70,16 @@ }); integer dskcnt = size(usable_target_map); - y2milestone( "dskcnt %1", dskcnt ); + y2milestone("dskcnt:%1", dskcnt); - if (dskcnt > 10) + if (dskcnt >= 10) { integer i = 1; - list disklist = []; + list<term> disklist = []; foreach(string tname, map tdata, usable_target_map, { - disklist = add(disklist, `item(`id(tname), sformat("%1: %2", i, tname))); + string tlinename = tdata["proposal_name"]:tdata["device"]:"?"; + string tline = sformat("%1: %2", i, tlinename); + disklist = add(disklist, `item(`id(tname), tline)); i = i + 1; }); buttonbox = add(buttonbox, `SelectionBox(`id(`disklist), `opt(`notify), @@ -87,14 +89,9 @@ { integer i = 1; foreach(string tname, map tdata, usable_target_map, { - string tlinename = tdata["name"]:"?"; - if (haskey(tdata, "name")) - tlinename = tdata["proposal_name"]:"?"; - if( tdata["type"]:`CT_UNKNOWN==`CT_DMRAID ) - tlinename = "BIOS RAID " + tdata["name"]:"?"; - string tline = "&" + i + ": " + tlinename; - boolean sel = Storage::GetPartDisk()==tname && - !custom_val; + string tlinename = tdata["proposal_name"]:tdata["device"]:"?"; + string tline = sformat("&%1: %2", i, tlinename); + boolean sel = Storage::GetPartDisk() == tname && !custom_val; buttonbox = add(buttonbox, `Left(`RadioButton(`id(tname), tline, sel))); i = i + 1; }); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org