Skip to content

Commit

Permalink
Merge pull request #8010 in SW/shopware from ntr/5.6/fix-emotion-prev…
Browse files Browse the repository at this point in the history
…iew to 5.6

* commit '826c35d9300f37b638f3514bb53863a93f2756dc':
  NTR - Fix emotion preview
  • Loading branch information
shyim committed Aug 21, 2019
2 parents 82c2e97 + 826c35d commit 3ebb579
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions UPGRADE-5.6.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ This changelog references changes done in Shopware 5.6 patch versions.
* Changed `sAdmin::sGetCountryList` to use CountryService
* Changed the pagesize for the snippets module
* Changed the handling of browser notifications to support browsers without notifications
* Changed `themes/Frontend/Bare/frontend/_includes/emotion.tpl` to also work with emotion preview

## 5.6.0

Expand Down
4 changes: 2 additions & 2 deletions themes/Frontend/Bare/frontend/_includes/emotion.tpl
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<div class="emotion--wrapper" style="display: none"
data-controllerUrl="{url module=widgets controller=emotion action=index emotionId=$emotion.id controllerName=$Controller}"
data-controllerUrl="{url module=widgets controller=emotion action=index emotionId=$emotion.id secret=$previewSecret controllerName=$Controller}"
data-availableDevices="{$emotion.devices}"
data-ajax="{if $theme.ajaxEmotionLoading}true{else}false{/if}"
{if isset($showListing)} data-showListing="{if $showListing == 1}true{else}false{/if}"{/if}{block name="frontend_emotion_include_attributes"}{/block}>
{if !$theme.ajaxEmotionLoading}
<template style="display: none">
{action module=widgets controller=emotion action=index emotionId=$emotion.id controllerName=$Controller}
{action module=widgets controller=emotion action=index emotionId=$emotion.id secret=$previewSecret controllerName=$Controller}
</template>
{/if}
</div>

0 comments on commit 3ebb579

Please sign in to comment.