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

This reverts commit dee02ac3ba.
2019-07-19 10:29:52 -03:00
parent 4991941d03
commit 2ceb99e151
2 changed files with 22 additions and 5 deletions
@@ -46,12 +46,20 @@ export default Ember.Component.extend({
      return true;
    }

-    const groupNames = groups.map(g => g.name.toLowerCase());
-    const noAdsGroupNames = this.siteSettings.no_ads_for_groups
-      .split("|")
-      .map(g => g.toLowerCase());
+    let noAdsGroups = this.siteSettings.no_ads_for_groups.split("|");

-    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(