Author: lslezak Date: Thu Jul 28 15:04:22 2011 New Revision: 65077 URL: http://svn.opensuse.org/viewcvs/yast?rev=65077&view=rev Log: - properly display selected migration type when going back in the migration workflow (bnc#708667) Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes?rev=65077&r1=65076&r2=65077&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes Thu Jul 28 15:04:22 2011 @@ -3,6 +3,8 @@ - fixed registration status check when registering against SMT (bnc#708888) +- properly display selected migration type when going back in + the migration workflow (bnc#708667) ------------------------------------------------------------------- Mon Jul 18 12:48:20 UTC 2011 - lslezak@suse.cz Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp?rev=65077&r1=65076&r2=65077&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp Thu Jul 28 15:04:22 2011 @@ -154,6 +154,8 @@ { // heading text string heading_text = _("Migration Type"); + // full migration? + boolean full = sort(Wagon::DupRepos()) == sort(Pkg::SourceGetCurrent(true)); term contents = `VBox( // frame label @@ -163,9 +165,9 @@ `RadioButtonGroup(`id(`migration_type), `VBox( // radio button - `Left(`RadioButton(`id(`minimal), _("&Minimal migration (only the core packages)"), true)), + `Left(`RadioButton(`id(`minimal), _("&Minimal migration (only the core packages)"), !full)), // radio button - `Left(`RadioButton(`id(`full), _("&Full migration (all packages)"))) + `Left(`RadioButton(`id(`full), _("&Full migration (all packages)"), full)) ) ) ) @@ -194,7 +196,8 @@ symbol ret = nil; while (true) { - ret = (symbol)UI::UserInput(); + // go to advanced config it was used previously + ret = (Wagon::ManualRepoSelection()) ? `advanced : (symbol)UI::UserInput(); if (ret == `next) { @@ -207,6 +210,7 @@ // DUP: all repositories y2milestone("Selected full migration, using %1 repositories", size(Pkg::SourceGetCurrent(true))); Wagon::SetDupRepos(Pkg::SourceGetCurrent(true)); + Wagon::SetManualRepoSelection(false); } else if (mtype == `minimal) { @@ -229,6 +233,7 @@ y2milestone("Converted aliases to ids: %1", added_repos); Wagon::SetDupRepos(added_repos); + Wagon::SetManualRepoSelection(false); } else { @@ -255,14 +260,20 @@ y2milestone("Manual DUP repository selection selected"); ret = DupSelectionDialog(); - if (ret == `abort || ret == `close || ret == `next) + if (ret == `abort || ret == `close) { break; } + else if (ret == `next) + { + Wagon::SetManualRepoSelection(true); + break; + } else if (ret == `back) { // refresh the dialog SetMigrationSelectionDialogContent(); + Wagon::SetManualRepoSelection(false); } else { Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp?rev=65077&r1=65076&r2=65077&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Thu Jul 28 15:04:22 2011 @@ -123,6 +123,20 @@ dup_repos = repos; } + boolean manual_repo_selection = false; + + // manual or automatic DUP repo selection? + global boolean ManualRepoSelection() + { + return manual_repo_selection; + } + + global void SetManualRepoSelection(boolean manual) + { + y2milestone("Manual DUP repo selection: %1", manual); + manual_repo_selection = manual; + } + // list of repositories (aliases) added by suse_register list<string> new_registration_repos = []; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org