From 4e63a3c7bd848f59859206d3c21061605425faeb Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane@kilkelly.me>
Date: Mon, 6 Jun 2016 13:12:24 +0100
Subject: [PATCH] Move `betaProgram` flag up to top-level of user object

---
 .../web/app/coffee/Features/Project/ProjectController.coffee    | 1 +
 services/web/app/coffee/models/User.coffee                      | 2 +-
 services/web/config/settings.defaults.coffee                    | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/web/app/coffee/Features/Project/ProjectController.coffee b/services/web/app/coffee/Features/Project/ProjectController.coffee
index f810067991..52d99ae866 100644
--- a/services/web/app/coffee/Features/Project/ProjectController.coffee
+++ b/services/web/app/coffee/Features/Project/ProjectController.coffee
@@ -250,6 +250,7 @@ module.exports = ProjectController =
 						featureSwitches: user.featureSwitches
 						features: user.features
 						refProviders: user.refProviders
+						betaProgram: user.betaProgram
 					}
 					userSettings: {
 						mode  : user.ace.mode
diff --git a/services/web/app/coffee/models/User.coffee b/services/web/app/coffee/models/User.coffee
index e5afd0a038..ba0a862fd2 100644
--- a/services/web/app/coffee/models/User.coffee
+++ b/services/web/app/coffee/models/User.coffee
@@ -36,7 +36,6 @@ UserSchema = new Schema
 							compileGroup:  { type:String,  default: Settings.defaultFeatures.compileGroup }
 							templates:     { type:Boolean, default: Settings.defaultFeatures.templates }
 							references:    { type:Boolean, default: Settings.defaultFeatures.references }
-							betaProgram:   { type:Boolean, default: Settings.defaultFeatures.betaProgram}
 						}
 	featureSwitches	  : {
 		pdfng: { type: Boolean }
@@ -59,6 +58,7 @@ UserSchema = new Schema
 		mendeley: Boolean  # coerce the refProviders values to Booleans
 		zotero: Boolean
 	}
+	betaProgram:   { type:Boolean, default: false}
 
 conn = mongoose.createConnection(Settings.mongo.url, server: poolSize: 10)
 
diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee
index 266db67466..beb933e4c9 100644
--- a/services/web/config/settings.defaults.coffee
+++ b/services/web/config/settings.defaults.coffee
@@ -153,7 +153,6 @@ module.exports =
 		compileGroup: "standard"
 		references: true
 		templates: true
-		betaProgram: false
 
 	plans: plans = [{
 		planCode: "personal"