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

Revert "DEV: migrate no_ads_for_groups to use IDs instead of group names (#77)" (#78) 

This reverts commit 09a92f3438.
This commit is contained in:
Roman Rizzi 2019-07-16 11:57:20 -03:00 committed by GitHub
parent 93af4587fa
commit dee02ac3ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,21 +46,12 @@ export default Ember.Component.extend({
return true; return true;
} }
let noAdsGroups = this.siteSettings.no_ads_for_groups const groupNames = groups.map(g => g.name.toLowerCase());
.split("|") const noAdsGroupNames = this.siteSettings.no_ads_for_groups
.split("|")
.map(g => g.toLowerCase());
// TODO: Remove when 2.4 becomes the new stable. This is for backwards compatibility. return !groupNames.any(g => noAdsGroupNames.includes(g));
const groupListUseIDs = this.site.group_list_use_ids;
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));
}, },
@computed( @computed(

5
plugin.rb
View File

@ -35,11 +35,6 @@ after_initialize do
require_dependency File.expand_path('../app/controllers/house_ad_settings_controller', __FILE__) require_dependency File.expand_path('../app/controllers/house_ad_settings_controller', __FILE__)
require_dependency 'application_controller' require_dependency 'application_controller'
# TODO: remove when 2.4 becomes the new stable
current_version = ActiveRecord::Migrator.current_version
min_version = 201_907_081_533_31
add_to_serializer(:site, :group_list_use_ids) { current_version >= min_version }
add_to_serializer :site, :house_creatives do add_to_serializer :site, :house_creatives do
AdPlugin::HouseAdSetting.settings_and_ads AdPlugin::HouseAdSetting.settings_and_ads
end end