From 75d9912449b69d656d8cc2171ed6f973bcebc345 Mon Sep 17 00:00:00 2001 From: James Allen Date: Tue, 15 Mar 2016 14:44:06 +0000 Subject: [PATCH] Use _.defaults to simplify assigning default features --- .../Project/ProjectEditorHandler.coffee | 33 +++++-------------- 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/services/web/app/coffee/Features/Project/ProjectEditorHandler.coffee b/services/web/app/coffee/Features/Project/ProjectEditorHandler.coffee index fb4e072672..a3d8319424 100644 --- a/services/web/app/coffee/Features/Project/ProjectEditorHandler.coffee +++ b/services/web/app/coffee/Features/Project/ProjectEditorHandler.coffee @@ -15,15 +15,6 @@ module.exports = ProjectEditorHandler = deletedByExternalDataSource : project.deletedByExternalDataSource || false deletedDocs: project.deletedDocs members: [] - - result.features = # defaults - collaborators: -1 # Infinite - versioning: false - dropbox:false - compileTimeout: 60 - compileGroup:"standard" - templates: false - references: false owner = null for member in members @@ -34,21 +25,15 @@ module.exports = ProjectEditorHandler = if owner? result.owner = @buildUserModelView owner, "owner" - if owner?.features? - if owner.features.collaborators? - result.features.collaborators = owner.features.collaborators - if owner.features.versioning? - result.features.versioning = owner.features.versioning - if owner.features.dropbox? - result.features.dropbox = owner.features.dropbox - if owner.features.compileTimeout? - result.features.compileTimeout = owner.features.compileTimeout - if owner.features.compileGroup? - result.features.compileGroup = owner.features.compileGroup - if owner.features.templates? - result.features.templates = owner.features.templates - if owner.features.references? - result.features.references = owner.features.references + result.features = _.defaults(owner?.features or {}, { + collaborators: -1 # Infinite + versioning: false + dropbox:false + compileTimeout: 60 + compileGroup:"standard" + templates: false + references: false + }) return result