From 19fdc75e608f391ed35c1014f4bcdc03397780de Mon Sep 17 00:00:00 2001 From: Tobias Johansson Date: Thu, 4 Oct 2018 17:44:08 +0200 Subject: [PATCH] Free assets: Assets should not be advertised as free if the user is a logged in subscriber. --- src/templates/_macros/_asset_list_item.pug | 2 +- src/templates/nodes/view_base.pug | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/templates/_macros/_asset_list_item.pug b/src/templates/_macros/_asset_list_item.pug index 3c894e06..4e8882ca 100644 --- a/src/templates/_macros/_asset_list_item.pug +++ b/src/templates/_macros/_asset_list_item.pug @@ -3,7 +3,7 @@ | {% set node_type = asset.properties.content_type if asset.properties.content_type else asset.node_type %} a.card.asset.card-image-fade.pr-0.mx-0.mb-2( - class="js-item-open {% if asset.permissions.world %}free{% endif %}", + class="js-item-open {% if asset.permissions.world and not current_user.has_cap('subscriber') %}free{% endif %}", data-node_id="{{ asset._id }}", title="{{ asset.name }}", href='{{ url_for_node(node=asset) }}') diff --git a/src/templates/nodes/view_base.pug b/src/templates/nodes/view_base.pug index f93991a6..90a14d19 100644 --- a/src/templates/nodes/view_base.pug +++ b/src/templates/nodes/view_base.pug @@ -133,7 +133,8 @@ section.node-details-meta.pl-4.pr-2.py-2.border-bottom script(src="{{ url_for('static_cloud', filename='assets/js/tagged_assets.min.js') }}") script. $(function() { - $('.js-asset-list').loadTaggedAssets(4, 0); + let is_subscriber = {{ current_user.has_cap('subscriber')|string|lower }}; + $('.js-asset-list').loadTaggedAssets(4, 0, is_subscriber); }) .tagged-similar.p-3 h6 Similar assets