Fix bug where admin mode would be switched off for user previewing emails.
This commit is contained in:
parent
03410dd343
commit
457430fe81
2 changed files with 6 additions and 7 deletions
|
|
@ -87,16 +87,10 @@ sub generateEmailContent {
|
|||
sub getAssetContent {
|
||||
my $self = shift;
|
||||
my $asset = shift;
|
||||
my $var = $self->session->var;
|
||||
|
||||
my $adminOn = $var->isAdminOn;
|
||||
$var->switchAdminOff;
|
||||
|
||||
$asset->prepareView;
|
||||
my $content = $asset->view;
|
||||
|
||||
$var->switchAdminOn if $adminOn;
|
||||
|
||||
return $content;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -96,9 +96,13 @@ sub processContentAsUser {
|
|||
my $issueId = shift;
|
||||
my $userId = shift;
|
||||
my $configuration = shift || {};
|
||||
my $session = $self->session;
|
||||
my $var = $session->var;
|
||||
|
||||
my $session = $self->session;
|
||||
# Save state
|
||||
my $currentUser = $session->user;
|
||||
my $adminOn = $var->isAdminOn;
|
||||
$var->switchAdminOff;
|
||||
|
||||
# Become the desired user
|
||||
$session->user( { userId => $userId } );
|
||||
|
|
@ -120,6 +124,7 @@ sub processContentAsUser {
|
|||
|
||||
# Become ourselves again.
|
||||
$session->user( { userId => $currentUser->getId } );
|
||||
$var->switchAdminOn if $adminOn;
|
||||
|
||||
return $content;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue