web/modules/sniglets/Sniglets/ChannelEditor.pm | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit d3b314be46280dcc5099f64f8fd51c50b3c592a6
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Nov 3 11:29:35 2009 -0500
527881 - fixed issue where set was cleared when interacting with the channel merge
page
diff --git a/web/modules/sniglets/Sniglets/ChannelEditor.pm
b/web/modules/sniglets/Sniglets/ChannelEditor.pm
index 7e39817..922751d 100644
--- a/web/modules/sniglets/Sniglets/ChannelEditor.pm
+++ b/web/modules/sniglets/Sniglets/ChannelEditor.pm
@@ -880,10 +880,13 @@ sub channel_sync_prompt {
my %s = (target_channel => sprintf("<strong>%s</strong>",
$target->label),
source_channel => sprintf("<strong>%s</strong>",
$source->label));
- # Clear the packages for merge set to remove any old selections:
- my $set = RHN::Set->lookup(-label => 'packages_for_merge', -uid =>
$pxt->user->id);
- $set->empty;
- $set->commit;
+ #only clear if sync_type is not set, otherwise we clear the set on pagination
+ if (!$pxt->dirty_param("sync_type")) {
+ # Clear the packages for merge set to remove any old selections:
+ my $set = RHN::Set->lookup(-label => 'packages_for_merge', -uid =>
$pxt->user->id);
+ $set->empty;
+ $set->commit;
+ }
return PXT::Utils->perform_substitutions($params{__block__}, \%s);
}
Show replies by date