Author: aschnell Date: Wed Feb 22 11:16:07 2012 New Revision: 67507 URL: http://svn.opensuse.org/viewcvs/yast?rev=67507&view=rev Log: - show device name in zfcp dialog Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/zfcp/dialogs.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67507&r1=67506&r2=67507&view=diff ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Wed Feb 22 11:16:07 2012 @@ -130,24 +130,9 @@ /* Dialog caption */ string caption = _("DASD Disk Management"); - term header = `header( - // table header - `Right(_("Channel")), - // table header - _("Device"), - // table header - _("Type"), - // table header - _("Access Type"), - // table header - _("Use DIAG"), - // table header - _("Formatted"), - // table header - _("Partition Information") - ); + term header = `Empty(); - if (Mode::config ()) + if (Mode::config()) { header = `header( // table header @@ -156,7 +141,26 @@ _("Format"), // table header _("Use DIAG") - ); + ); + } + else + { + header = `header( + // table header + `Right(_("Channel")), + // table header + _("Device"), + // table header + _("Type"), + // table header + _("Access Type"), + // table header + _("Use DIAG"), + // table header + _("Formatted"), + // table header + _("Partition Information") + ); } list actions = [ Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67507&r1=67506&r2=67507&view=diff ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Wed Feb 22 11:16:07 2012 @@ -69,12 +69,25 @@ list<term> items = []; - items = maplist(integer k, map d, devices, { - string channel = d["detail", "controller_id"]:""; - string wwpn = d["detail", "wwpn"]:""; - string fcp_lun = d["detail", "fcp_lun"]:""; - return `item(`id(k), channel, wwpn, fcp_lun); - }); + if (Mode::config()) + { + items = maplist(integer k, map d, devices, { + string channel = d["detail", "controller_id"]:""; + string wwpn = d["detail", "wwpn"]:""; + string fcp_lun = d["detail", "fcp_lun"]:""; + return `item(`id(k), channel, wwpn, fcp_lun); + }); + } + else + { + items = maplist(integer k, map d, devices, { + string channel = d["detail", "controller_id"]:""; + string wwpn = d["detail", "wwpn"]:""; + string fcp_lun = d["detail", "fcp_lun"]:""; + string dev_name = d["dev_name"]:""; + return `item(`id(k), channel, wwpn, fcp_lun, dev_name); + }); + } return items; } @@ -91,14 +104,32 @@ /* Dialog caption */ string caption = _("Configured ZFCP Devices"); - term header = `header( - // table header - `Right(_("Channel Number")), - // table header - `Right(_("WWPN")), - // table header - `Right(_("ZFCP-LUN")) - ); + term header = `Empty(); + + if (Mode::config()) + { + header = `header( + // table header + `Right(_("Channel Number")), + // table header + `Right(_("WWPN")), + // table header + `Right(_("ZFCP-LUN")) + ); + } + else + { + header = `header( + // table header + `Right(_("Channel Number")), + // table header + `Right(_("WWPN")), + // table header + `Right(_("ZFCP-LUN")), + // table header + _("Device") + ); + } /* Dialog content */ term content = `VBox( -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org