github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #469 from sharelatex/ja-feature-flag-rename

Browse source 
Split references feature flag into mendeley and referencesSearch
This commit is contained in:
James Allen 2018-04-03 11:53:58 +01:00 committed by GitHub
commit 0a00dea610
2 changed files with 38 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
services/web/app/coffee/Features/Project/ProjectEditorHandler.coffee
View file

@ -35,10 +35,17 @@ module.exports = ProjectEditorHandler =
compileGroup:"standard" compileGroup:"standard"
templates: false templates: false
references: false references: false
referencesSearch: false
mendeley: false
trackChanges: false trackChanges: false
trackChangesVisible: ProjectEditorHandler.trackChangesAvailable trackChangesVisible: ProjectEditorHandler.trackChangesAvailable
}) })
# Originally these two feature flags were both signalled by the now-deprecated `references` flag.
# For older users, the presence of the `references` feature flag should still turn on these features.
result.features.referencesSearch = result.features.referencesSearch or result.features.references
result.features.mendeley = result.features.mendeley or result.features.references
return result return result
buildOwnerAndMembersViews: (members) -> buildOwnerAndMembersViews: (members) ->

60
services/web/app/coffee/models/User.coffee
View file

@ -20,40 +20,42 @@ UserSchema = new Schema
loginCount : {type : Number, default: 0} loginCount : {type : Number, default: 0}
holdingAccount : {type : Boolean, default: false} holdingAccount : {type : Boolean, default: false}
ace : { ace : {
mode : {type : String, default: 'none'} mode : {type : String, default: 'none'}
theme : {type : String, default: 'textmate'} theme : {type : String, default: 'textmate'}
fontSize : {type : Number, default:'12'} fontSize : {type : Number, default:'12'}
autoComplete: {type : Boolean, default: true} autoComplete: {type : Boolean, default: true}
autoPairDelimiters: {type : Boolean, default: true} autoPairDelimiters: {type : Boolean, default: true}
spellCheckLanguage : {type : String, default: "en"} spellCheckLanguage : {type : String, default: "en"}
pdfViewer : {type : String, default: "pdfjs"} pdfViewer : {type : String, default: "pdfjs"}
syntaxValidation : {type : Boolean} syntaxValidation : {type : Boolean}
} }
features : { features : {
collaborators: { type:Number, default: Settings.defaultFeatures.collaborators } collaborators: { type:Number, default: Settings.defaultFeatures.collaborators }
versioning: { type:Boolean, default: Settings.defaultFeatures.versioning } versioning: { type:Boolean, default: Settings.defaultFeatures.versioning }
dropbox: { type:Boolean, default: Settings.defaultFeatures.dropbox } dropbox: { type:Boolean, default: Settings.defaultFeatures.dropbox }
github: { type:Boolean, default: Settings.defaultFeatures.github } github: { type:Boolean, default: Settings.defaultFeatures.github }
compileTimeout: { type:Number, default: Settings.defaultFeatures.compileTimeout } compileTimeout: { type:Number, default: Settings.defaultFeatures.compileTimeout }
compileGroup: { type:String, default: Settings.defaultFeatures.compileGroup } compileGroup: { type:String, default: Settings.defaultFeatures.compileGroup }
templates: { type:Boolean, default: Settings.defaultFeatures.templates } templates: { type:Boolean, default: Settings.defaultFeatures.templates }
references: { type:Boolean, default: Settings.defaultFeatures.references } references: { type:Boolean, default: Settings.defaultFeatures.references }
trackChanges: { type:Boolean, default: Settings.defaultFeatures.trackChanges } trackChanges: { type:Boolean, default: Settings.defaultFeatures.trackChanges }
} mendeley: { type:Boolean, default: Settings.defaultFeatures.mendeley }
referencesSearch: { type:Boolean, default: Settings.defaultFeatures.referencesSearch }
}
referal_id : {type:String, default:() -> uuid.v4().split("-")[0]} referal_id : {type:String, default:() -> uuid.v4().split("-")[0]}
refered_users: [ type:ObjectId, ref:'User' ] refered_users: [ type:ObjectId, ref:'User' ]
refered_user_count: { type:Number, default: 0 } refered_user_count: { type:Number, default: 0 }
subscription: subscription:
recurlyToken : String recurlyToken : String
freeTrialExpiresAt: Date freeTrialExpiresAt: Date
freeTrialDowngraded: Boolean freeTrialDowngraded: Boolean
freeTrialPlanCode: String freeTrialPlanCode: String
# This is poorly named. It does not directly correspond # This is poorly named. It does not directly correspond
# to whether the user has has a free trial, but rather # to whether the user has has a free trial, but rather
# whether they should be allowed one in the future. # whether they should be allowed one in the future.
# For example, a user signing up directly for a paid plan # For example, a user signing up directly for a paid plan
# has this set to true, despite never having had a free trial # has this set to true, despite never having had a free trial
hadFreeTrial: {type: Boolean, default: false} hadFreeTrial: {type: Boolean, default: false}
refProviders: { refProviders: {
mendeley: Boolean # coerce the refProviders values to Booleans mendeley: Boolean # coerce the refProviders values to Booleans
zotero: Boolean zotero: Boolean