Merge pull request Automattic#581 from Automattic/add/wordads-jetpack…

…-dev WordAds: Add Config flag for Jetpack Sites to manage ads.
josemalcher · Nov 24, 2015 · 169dee6 · 169dee6
2 parents fb3071b + 67f092f
commit 169dee6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/client/lib/ads/utils.js b/client/lib/ads/utils.js
@@ -12,7 +12,10 @@ module.exports = {
  */
  canAccessWordads: site => {
  if ( config.isEnabled( 'manage/ads' ) ) {
- return site.options && site.options.wordads && site.user_can_manage && ! site.jetpack;
+ return site.options &&
+ site.options.wordads &&
+ site.user_can_manage &&
+ ( ! site.jetpack || config.isEnabled( 'manage/ads/jetpack' ) );
  }
 
  return false;

diff --git a/config/development.json b/config/development.json
@@ -98,6 +98,7 @@
  "manage/customize": true,
 
  "manage/ads": true,
+ "manage/ads/jetpack": true,
 
  "vip": false,
  "vip/deploys": true,