Browse Source

Move `betaProgram` flag up to top-level of user object

Shane Kilkelly 10 years ago
parent
commit
4e63a3c7bd

+ 1 - 0
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

+ 1 - 1
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)
 

+ 0 - 1
services/web/config/settings.defaults.coffee

@@ -153,7 +153,6 @@ module.exports =
 		compileGroup: "standard"
 		references: true
 		templates: true
-		betaProgram: false
 
 	plans: plans = [{
 		planCode: "personal"