Discource-C
/
discourse-adplugin
mirror of https://github.com/discourse/discourse-adplugin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: removes part of the 2.4 legacy code forgotten (#87) 

no_ads_for_groups returns a list of ids
This commit is contained in:
Joffrey JAFFEUX 2020-08-03 21:01:51 +02:00 committed by GitHub
parent 1d073e2a96
commit c27d5f8e85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
assets/javascripts/discourse/components/ad-component.js.es6
View File

@ -51,19 +51,10 @@ export default Ember.Component.extend({
return true; return true;
} }
let noAdsGroups = this.siteSettings.no_ads_for_groups.split("|"); let noAdsGroups = this.siteSettings.no_ads_for_groups
.split("|")
// TODO: Remove when 2.4 becomes the new stable. This is for backwards compatibility. .filter(Boolean);
const groupListUseIDs = this.site.group_list_use_ids; let currentGroups = groups.map(g => g.id.toString());
let currentGroups = groups;
if (groupListUseIDs) {
currentGroups = currentGroups.map(g => g.id.toString());
} else {
currentGroups = currentGroups.map(g => g.name.toLowerCase());
noAdsGroups = noAdsGroups.map(g => g.toLowerCase());
}
return !currentGroups.any(g => noAdsGroups.includes(g)); return !currentGroups.any(g => noAdsGroups.includes(g));
}, },