UnitedKnowledge/webgui_newsletter
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug where admin mode would be switched off for user previewing emails.

Browse source
This commit is contained in:
Martin Kamerbeek 2010-06-02 13:36:46 +02:00
parent 03410dd343
commit 457430fe81
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/WebGUI/Asset/Wobject/NewsletterCollection.pm
View file

@ -87,16 +87,10 @@ sub generateEmailContent {
sub getAssetContent { sub getAssetContent {
my $self = shift; my $self = shift;
my $asset = shift; my $asset = shift;
my $var = $self->session->var;
my $adminOn = $var->isAdminOn;
$var->switchAdminOff;
$asset->prepareView; $asset->prepareView;
my $content = $asset->view; my $content = $asset->view;
$var->switchAdminOn if $adminOn;
return $content; return $content;
} }

7
lib/WebGUI/AssetAspect/Mailable.pm
View file

@ -96,9 +96,13 @@ sub processContentAsUser {
my $issueId = shift; my $issueId = shift;
my $userId = shift; my $userId = shift;
my $configuration = shift || {}; my $configuration = shift || {};
my $session = $self->session;
my $var = $session->var;
my $session = $self->session; # Save state
my $currentUser = $session->user; my $currentUser = $session->user;
my $adminOn = $var->isAdminOn;
$var->switchAdminOff;
# Become the desired user # Become the desired user
$session->user( { userId => $userId } ); $session->user( { userId => $userId } );
@ -120,6 +124,7 @@ sub processContentAsUser {
# Become ourselves again. # Become ourselves again.
$session->user( { userId => $currentUser->getId } ); $session->user( { userId => $currentUser->getId } );
$var->switchAdminOn if $adminOn;
return $content; return $content;
} }