Author: locilka Date: Wed Aug 29 11:39:19 2007 New Revision: 40555 URL: http://svn.opensuse.org/viewcvs/yast?rev=40555&view=rev Log: - Not skipping to the "Add-On Product Media" dialog in case of going_back in the installation workflow even if there is not Add-On in use yet (#305809). Modified: trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on-workflow.ycp Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.changes?rev=40555&r1=40554&r2=40555&view=diff ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Wed Aug 29 11:39:19 2007 @@ -6,6 +6,9 @@ dialog buttons when redrawing list of used Add-Ons (#305788). - Requesting confirmation when user wants to delete already added Add-On (#305802). +- Not skipping to the "Add-On Product Media" dialog in case of + going_back in the installation workflow even if there is not + Add-On in use yet (#305809). - 2.15.14 ------------------------------------------------------------------- Modified: trunk/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on-workflow.ycp?rev=40555&r1=40554&r2=40555&view=diff ============================================================================== --- trunk/add-on/src/add-on-workflow.ycp (original) +++ trunk/add-on/src/add-on-workflow.ycp Wed Aug 29 11:39:19 2007 @@ -30,9 +30,12 @@ import "Stage"; import "Wizard"; import "Confirm"; +import "GetInstArgs"; include "packager/inst_source_dialogs.ycp"; +boolean going_back_in_workflow = GetInstArgs::going_back(); + /** * Initialize current inst. sources */ @@ -1057,27 +1060,29 @@ boolean not_enough_memory = (Stage::initial() && HasInsufficientMemory()); boolean no_addons = (size (AddOnProduct::add_on_products) == 0); + // bugzilla #239630 + // It might be dangerous to add more installation sources in installation + // on machine with less memory + // Do not report when some add-ons are already in use + if (not_enough_memory && ! no_addons) { + if (! ContinueIfInsufficientMemory ()) return `next; + } + // FATE #301928 - Saving one click - if (no_addons) { + // Bugzilla #305809 if "going_back", do not save that click! + if (no_addons && ! going_back_in_workflow) { + y2milestone ("Skipping to media_select"); + // only once + going_back_in_workflow = false; ret = `first_time; } // Show Add-Ons table - if (not_enough_memory || ! no_addons) { - Redraw (enable_back, enable_next, back_button, next_button); - } + Redraw (enable_back, enable_next, back_button, next_button); // store the initial settings, only once WorkflowManager::SetBaseWorkflow (false); - // bugzilla #239630 - // It might be dangerous to add more installation sources in installation - // on machine with less memory - // Do not report when some add-ons are already in use - if (not_enough_memory && no_addons) { - if (! ContinueIfInsufficientMemory ()) return `next; - } - // added / removed boolean some_addon_changed = false; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org