discourse/discourse-adplugin
1
0
Fork 0
mirror of https://github.com/discourse/discourse-adplugin.git synced 2025-07-05 12:52:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

DEV: migrate no_ads_for_groups to use IDs instead of group names (#77) [Undo revert] (#79)

Browse Source 
This reverts commit dee02ac3ba3a080d59084fd26011b945c615ca55.
This commit is contained in:
Roman Rizzi 2019-07-19 10:29:52 -03:00 committed by GitHub
parent 4991941d03
commit 2ceb99e151
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

9
plugin.rb
View File

@ -28,6 +28,12 @@ module ::AdPlugin
end end
end end
# TODO: Remove this once 2.4.0.beta3 is released.
# HACK: Checking if the file exists, this means we can assume the migration happenned
above_min_version = File.exist?(
File.expand_path('../../../db/migrate/20190717133743_migrate_group_list_site_settings.rb', __FILE__)
)
after_initialize do after_initialize do
require_dependency File.expand_path('../app/models/house_ad', __FILE__) require_dependency File.expand_path('../app/models/house_ad', __FILE__)
require_dependency File.expand_path('../app/models/house_ad_setting', __FILE__) require_dependency File.expand_path('../app/models/house_ad_setting', __FILE__)
@ -35,6 +41,9 @@ 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
add_to_serializer(:site, :group_list_use_ids) { above_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