alois/Verso
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved load project from old proj controller to new one

Browse Source
This commit is contained in:
Henry Oswald
2014-04-08 17:44:31 +01:00
parent 9398625ac5
commit 88ba45b9dc
6 changed files with 173 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/app/coffee/Features/Project/ProjectController.coffee
+85
View File
@@ -6,9 +6,12 @@ projectCreationHandler = require("./ProjectCreationHandler")
metrics = require('../../infrastructure/Metrics')
sanitize = require('sanitizer')
Project = require('../../models/Project').Project
User = require('../../models/User').User
TagsHandler = require("../Tags/TagsHandler")
SubscriptionLocator = require("../Subscription/SubscriptionLocator")
_ = require("underscore")
Settings = require("settings-sharelatex")
SecurityManager = require("../../managers/SecurityManager")
module.exports =
@@ -72,6 +75,88 @@ module.exports =
timer.done()
loadEditor: (req, res)->
timer = new metrics.Timer("load-editor")
if !Settings.editorIsOpen
res.render("general/closed", {title:"updating site"})
else
if req.session.user?
user_id = req.session.user._id
else
user_id = 'openUser'
project_id = req.params.Project_id
Project.findPopulatedById project_id, (err, project)->
User.findById user_id, (err, user)->
if user_id == 'openUser'
anonymous = true
user =
id : user_id
ace:
mode:'none'
theme:'textmate'
fontSize: '12'
autoComplete: true
spellCheckLanguage: ""
pdfViewer: ""
subscription:
freeTrial:
allowed: true
featureSwitches:
dropbox: false
trackChanges: false
else
anonymous = false
SubscriptionLocator.getUsersSubscription user?._id, (err, subscription)->
SecurityManager.userCanAccessProject user, project, (canAccess, privilegeLevel)->
allowedFreeTrial = true
if subscription? and subscription.freeTrial? and subscription.freeTrial.expiresAt?
allowedFreeTrial = !!subscription.freeTrial.allowed
if canAccess
timer.done()
res.render 'project/editor',
title: project.name
priority_title: true
bodyClasses: ["editor"]
project : project
#owner : project.owner_ref
userObject : JSON.stringify({
id : user.id
email : user.email
first_name : user.first_name
last_name : user.last_name
referal_id : user.referal_id
subscription :
freeTrial: {allowed: allowedFreeTrial}
})
userSettingsObject: JSON.stringify({
mode : user.ace.mode
theme : user.ace.theme
project_id : project._id
fontSize : user.ace.fontSize
autoComplete: user.ace.autoComplete
spellCheckLanguage: user.ace.spellCheckLanguage
pdfViewer : user.ace.pdfViewer
docPositions: {}
oldHistory: !!user.featureSwitches?.oldHistory
})
sharelatexObject : JSON.stringify({
siteUrl: Settings.siteUrl,
jsPath: res.locals.jsPath
})
privilegeLevel: privilegeLevel
loadPdfjs: (user.ace.pdfViewer == "pdfjs")
chatUrl: Settings.apis.chat.url
anonymous: anonymous
languages: Settings.languages
else
res.send 401
_buildListViewModel = (projects, collabertions, readOnlyProjects, tags, tagsGroupedByProject, subscription)->
# TODO: Remove this one month after the ability to start free trials was removed
if subscription? and subscription.freeTrial? and subscription.freeTrial.expiresAt?
services/web/app/coffee/controllers/ProjectController.coffee
-124
View File
@@ -20,130 +20,6 @@ FileStoreHandler = require("../Features/FileStore/FileStoreHandler")
module.exports = class ProjectController
constructor: ()->
list: (req, res, next)->
timer = new metrics.Timer("project-list")
user_id = req.session.user._id
startTime = new Date()
User.findById user_id, (error, user) ->
logger.log user_id: user_id, duration: (new Date() - startTime), "project list timer - User.findById"
startTime = new Date()
# TODO: Remove this one month after the ability to start free trials was removed
SubscriptionLocator.getUsersSubscription user._id, (err, subscription)->
logger.log user_id: user_id, duration: (new Date() - startTime), "project list timer - Subscription.getUsersSubscription"
startTime = new Date()
return next(error) if error?
# TODO: Remove this one month after the ability to start free trials was removed
if subscription? and subscription.freeTrial? and subscription.freeTrial.expiresAt?
freeTrial =
expired: !!subscription.freeTrial.downgraded
expiresAt: SubscriptionFormatters.formatDate(subscription.freeTrial.expiresAt)
TagsHandler.getAllTags user_id, (err, tags, tagsGroupedByProject)->
logger.log user_id: user_id, duration: (new Date() - startTime), "project list timer - TagsHandler.getAllTags"
startTime = new Date()
Project.findAllUsersProjects user_id, 'name lastUpdated publicAccesLevel', (projects, collabertions, readOnlyProjects)->
logger.log user_id: user_id, duration: (new Date() - startTime), "project list timer - Project.findAllUsersProjects"
startTime = new Date()
for project in projects
project.accessLevel = "owner"
for project in collabertions
project.accessLevel = "readWrite"
for project in readOnlyProjects
project.accessLevel = "readOnly"
projects = projects.concat(collabertions).concat(readOnlyProjects)
projects = projects.map (project)->
project.tags = tagsGroupedByProject[project._id] || []
return project
tags = _.sortBy tags, (tag)->
-tag.project_ids.length
logger.log projects:projects, collabertions:collabertions, readOnlyProjects:readOnlyProjects, user_id:user_id, "rendering project list"
sortedProjects = _.sortBy projects, (project)->
return - project.lastUpdated
res.render 'project/list',
title:'Your Projects'
priority_title: true
projects: sortedProjects
freeTrial: freeTrial
tags:tags
projectTabActive: true
logger.log user_id: user_id, duration: (new Date() - startTime), "project list timer - Finished"
timer.done()
loadEditor: (req, res)->
timer = new metrics.Timer("load-editor")
if !Settings.editorIsOpen
res.render("general/closed", {title:"updating site"})
else
if req.session.user?
user_id = req.session.user._id
else
user_id = 'openUser'
project_id = req.params.Project_id
Project.findPopulatedById project_id, (err, project)->
User.findById user_id, (err, user)->
if user_id == 'openUser'
anonymous = true
user =
id : user_id
ace:
mode:'none'
theme:'textmate'
fontSize: '12'
autoComplete: true
spellCheckLanguage: ""
pdfViewer: ""
subscription:
freeTrial:
allowed: true
featureSwitches:
dropbox: false
trackChanges: false
else
anonymous = false
SubscriptionLocator.getUsersSubscription user?._id, (err, subscription)->
SecurityManager.userCanAccessProject user, project, (canAccess, privilegeLevel)->
allowedFreeTrial = true
if subscription? and subscription.freeTrial? and subscription.freeTrial.expiresAt?
allowedFreeTrial = !!subscription.freeTrial.allowed
if canAccess
timer.done()
res.render 'project/editor',
title: project.name
priority_title: true
bodyClasses: ["editor"]
project : project
owner : project.owner_ref
userObject : JSON.stringify({
id : user.id
email : user.email
first_name : user.first_name
last_name : user.last_name
referal_id : user.referal_id
subscription :
freeTrial: {allowed: allowedFreeTrial}
})
userSettingsObject: JSON.stringify({
mode : user.ace.mode
theme : user.ace.theme
project_id : project._id
fontSize : user.ace.fontSize
autoComplete: user.ace.autoComplete
spellCheckLanguage: user.ace.spellCheckLanguage
pdfViewer : user.ace.pdfViewer
docPositions: {}
oldHistory: !!user.featureSwitches?.oldHistory
})
sharelatexObject : JSON.stringify({
siteUrl: Settings.siteUrl,
jsPath: res.locals.jsPath
})
privilegeLevel: privilegeLevel
userCanSeeDropbox: user.featureSwitches.dropbox and project.owner_ref._id+"" == user._id+""
loadPdfjs: (user.ace.pdfViewer == "pdfjs")
chatUrl: Settings.apis.chat.url
anonymous: anonymous
languages: Settings.languages,
startBufferingRequest: (req, res, next) ->
req.bufferedChunks = []
services/web/app/coffee/router.coffee
+1 -1
View File
@@ -96,7 +96,7 @@ module.exports = class Router
app.post '/project/new', AuthenticationController.requireLogin(), ProjectController.newProject
app.get '/project/new/template', TemplatesMiddlewear.saveTemplateDataInSession, AuthenticationController.requireLogin(), TemplatesController.createProjectFromZipTemplate
app.get '/Project/:Project_id', SecurityManager.requestCanAccessProject, Project.loadEditor
app.get '/Project/:Project_id', SecurityManager.requestCanAccessProject, ProjectController.loadEditor
app.get '/Project/:Project_id/file/:File_id', SecurityManager.requestCanAccessProject, FileStoreController.getFile
app.get '/Project/:Project_id/output/output.pdf', SecurityManager.requestCanAccessProject, CompileController.downloadPdf
services/web/app/views/project/partials/manage.jade
+3 -4
View File
@@ -9,10 +9,9 @@
a(href='#exportSettings', data-toggle="tab") Export & Copy
li
a(href='#deleteProjectTab', data-toggle="tab") Delete Project
- if(userCanSeeDropbox)
li#manageDropboxSettiingsTabLink
a(href='#dropboxProjectSettings', data-toggle='tab') Dropbox
span.label.label-warning beta
li#manageDropboxSettiingsTabLink
a(href='#dropboxProjectSettings', data-toggle='tab') Dropbox
span.label.label-warning beta
.tab-content.form-horizontal
.tab-pane#generalProjectSettings.form.form-horizontal.active
services/web/app/views/user/settings.jade
+3 -4
View File
@@ -20,10 +20,9 @@ block content
a(href='#passwordReset', data-toggle="tab") Password
li
a(href='#newsletter', data-toggle="tab") Newsletter
- if(userCanSeeDropbox)
li
a(href='#dropboxSettings', data-toggle="tab") Dropbox
span.label.label-warning beta
li
a(href='#dropboxSettings', data-toggle="tab") Dropbox
span.label.label-warning beta
li
a(href='#deleteAccount', data-toggle="tab") Delete Account