From ca1ebd041345452727982a3dbdce3c449506a36a Mon Sep 17 00:00:00 2001
From: James Allen <james@sharelatex.com>
Date: Sat, 22 Feb 2014 10:50:59 +0000
Subject: [PATCH] Take default features from settings

---
 services/web/app/coffee/models/User.coffee      |  6 +++---
 services/web/config/settings.development.coffee | 10 ++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/services/web/app/coffee/models/User.coffee b/services/web/app/coffee/models/User.coffee
index 2d8e980954..a4141880a0 100644
--- a/services/web/app/coffee/models/User.coffee
+++ b/services/web/app/coffee/models/User.coffee
@@ -26,9 +26,9 @@ UserSchema = new Schema
 							pdfViewer   :   {type : String, default: "pdfjs"}
 						}
 	features		  : {
-							collaborators: {type:Number, default:1}
-							versioning: {type:Boolean, default:false}
-							dropbox: {type:Boolean, default:false}
+							collaborators: { type:Number,  default: Settings.defaultFeatures.collaborators }
+							versioning:    { type:Boolean, default: Settings.defaultFeatures.versioning }
+							dropbox:       { type:Boolean, default: Settings.defaultFeatures.dropbox }
 						}
 	featureSwitches	  : {
 							dropbox: {type:Boolean, default:true},
diff --git a/services/web/config/settings.development.coffee b/services/web/config/settings.development.coffee
index 8404481f40..bbd5296671 100644
--- a/services/web/config/settings.development.coffee
+++ b/services/web/config/settings.development.coffee
@@ -112,14 +112,16 @@ module.exports =
 	#
 	# You can select the features that are enabled by default for new
 	# new users.
+	defaultFeatures: defaultFeatures =
+		collaborators: -1
+		dropbox: true
+		versioning: true
+
 	plans: plans = [{
 		planCode: "personal"
 		name: "Personal"
 		price: 0
-		features: 
-			collaborators: -1
-			dropbox: true
-			versioning: true
+		features: defaultFeatures
 	}]
 
 	# Spelling languages