IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-28 03:33:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: don't show the banner topic on error page

Browse Source
This commit is contained in:
Régis Hanol 2014-11-25 19:09:17 +01:00
parent 515b616d30
commit 183c93904d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/components/discourse-banner.js.es6
View File

@ -10,8 +10,8 @@ export default VisibleComponent.extend({
if (bannerKey) { bannerKey = parseInt(bannerKey, 10); }
if (dismissedBannerKey) { dismissedBannerKey = parseInt(dismissedBannerKey, 10); }
return bannerKey && dismissedBannerKey !== bannerKey;
}.property("user.dismissed_banner_key", "banner.key"),
return !this.get("hide") && bannerKey && dismissedBannerKey !== bannerKey;
}.property("user.dismissed_banner_key", "banner.key", "hide"),
actions: {
dismiss: function () {

2
app/assets/javascripts/discourse/templates/topic.hbs
View File

@ -1,7 +1,7 @@
<div class='container'>
{{custom-html "top"}}
{{global-notice}}
{{discourse-banner user=currentUser banner=site.banner overlay=view.hasScrolled}}
{{discourse-banner user=currentUser banner=site.banner overlay=view.hasScrolled hide=errorLoading}}
</div>
{{#if postStream.loaded}}