Author: kmachalkova Date: Fri Jul 4 16:38:45 2008 New Revision: 48894 URL: http://svn.opensuse.org/viewcvs/yast?rev=48894&view=rev Log: Do not show empty pkg description if search returns empty list (inform user that nothing was found) Modified: trunk/packager/src/clients/webpin_package_search.ycp Modified: trunk/packager/src/clients/webpin_package_search.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/webpin_package_search.ycp?rev=48894&r1=48893&r2=48894&view=diff ============================================================================== --- trunk/packager/src/clients/webpin_package_search.ycp (original) +++ trunk/packager/src/clients/webpin_package_search.ycp Fri Jul 4 16:38:45 2008 @@ -67,13 +67,19 @@ } void CreatePackageDescription( ) { - string checksum = (string) UI::QueryWidget(`id("results"), `CurrentItem ); - map citem = search_results [ index[checksum]: 0 ]: $[]; - - string descr = sformat(_("<b>Repository URL:</b> %1<br>"), citem["repoURL"]:""); - string version = sformat(_("<b>Version</b> %1<br>"), citem["version"]:""); + string checksum = (string) UI::QueryWidget(`id("results"), `CurrentItem ); + map citem = search_results [ index[checksum]: 0 ]: $[]; + string ret = ""; + + if ( citem != $[] ) { + string descr = sformat(_("<b>Repository URL:</b> %1<br>"), citem["repoURL"]:""); + string version = sformat(_("<b>Version</b> %1<br>"), citem["version"]:""); + ret = descr + version; + } + else + ret = _("No packages matching entered criteria were found"); - UI::ChangeWidget(`id("description"),`Value, descr+version); + UI::ChangeWidget(`id("description"),`Value, ret); } list CreatePackageList( list < map > results ) { @@ -230,13 +236,16 @@ Popup::ClearFeedback(); list items = CreatePackageList( search_results ); - if (items != nil) { + if (search_results != nil && search_results != []) { UI::ChangeWidget(`id("results"), `Items, items); UI::SetFocus(`id("results")); - CreatePackageDescription(); } + else + UI::SetFocus(`id("search_text")); + + CreatePackageDescription(); } - else + //else continue; } else if (dialog_ret == "results") { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org