From e0085c13c07f85d693151071a9e7cfc43bc66348 Mon Sep 17 00:00:00 2001 From: Martin Kamerbeek Date: Wed, 2 Jun 2010 18:23:53 +0200 Subject: [PATCH] Merging recent_issue_loop and older_issue_loop --- .../Asset/Wobject/NewsletterCollection.pm | 30 ++++++++---------- .../root_import_personalnewsletter.wgpkg | Bin 3648 -> 3712 bytes 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/lib/WebGUI/Asset/Wobject/NewsletterCollection.pm b/lib/WebGUI/Asset/Wobject/NewsletterCollection.pm index 6ae529f..f9a05f2 100644 --- a/lib/WebGUI/Asset/Wobject/NewsletterCollection.pm +++ b/lib/WebGUI/Asset/Wobject/NewsletterCollection.pm @@ -116,30 +116,26 @@ sub getViewVars { my $var = $self->get; - my $issueCount = 0; - my ( @recentIssues, @olderIssues ); - my $issues = $self->getIssues; + my $recentCount = 0; + my @issues; + my $issues = $self->getIssues; foreach my $issue ( @{ $issues } ) { my $issueVar = $issue->get; $issueVar->{ url } = $issue->getUrl; - $issueCount++; + if ( $recentCount < $self->get('recentIssueCount') ) { + $issueVar->{ content } = $self->getAssetContent( $issue ); + $issueVar->{ isRecent } = 1; + $recentCount++; + } - if ( $issueCount <= $self->get('recentIssueCount') ) { - $issueVar->{ content } = $self->getAssetContent( $issue ); - - push @recentIssues, $issueVar; - } - else { - push @olderIssues, $issueVar; - } + push @issues, $issueVar; } - $var->{ recent_issue_loop } = \@recentIssues; - $var->{ recent_issue_count } = scalar @recentIssues; - $var->{ older_issue_loop } = \@olderIssues; - $var->{ older_issue_count } = scalar @olderIssues; - $var->{ issue_count } = $issueCount; + $var->{ recent_issue_count } = $recentCount; + $var->{ older_issue_count } = scalar( @issues ) - $recentCount; + $var->{ issue_loop } = \@issues; + $var->{ issue_count } = scalar @issues; $self->appendSubscriptionFormVars( $var ); diff --git a/sbin/packages/root_import_personalnewsletter.wgpkg b/sbin/packages/root_import_personalnewsletter.wgpkg index 8a8f22cb669d578c2a53e9bc07ec4f0a589b6393..6ba7a9d2f544530c139a4149928e568b9cd99b74 100644 GIT binary patch literal 3712 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