mirror of
https://github.com/yu-i-i/overleaf-cep.git
synced 2026-06-03 06:09:02 +02:00
Merge pull request #25060 from overleaf/mj-core-pug-bs5
[web] Convert various pug pages to BS5 GitOrigin-RevId: f42de89eca778db19d5faa8a19fa8a210c7a749b
This commit is contained in:
committed by
Copybot
parent
447be67f78
commit
d7bd665bee
@@ -16,6 +16,7 @@ import ProjectAuditLogHandler from '../Project/ProjectAuditLogHandler.js'
|
||||
import Errors from '../Errors/Errors.js'
|
||||
import AuthenticationController from '../Authentication/AuthenticationController.js'
|
||||
import PrivilegeLevels from '../Authorization/PrivilegeLevels.js'
|
||||
import SplitTestHandler from '../SplitTests/SplitTestHandler.js'
|
||||
|
||||
// This rate limiter allows a different number of requests depending on the
|
||||
// number of callaborators a user is allowed. This is implemented by providing
|
||||
@@ -244,6 +245,10 @@ async function generateNewInvite(req, res) {
|
||||
async function viewInvite(req, res) {
|
||||
const projectId = req.params.Project_id
|
||||
const { token } = req.params
|
||||
|
||||
// Read split test assignment so that it's available for Pug to read
|
||||
await SplitTestHandler.promises.getAssignment(req, res, 'core-pug-bs5')
|
||||
|
||||
const _renderInvalidPage = function () {
|
||||
res.status(404)
|
||||
logger.debug({ projectId }, 'invite not valid, rendering not-valid page')
|
||||
|
||||
@@ -4,9 +4,13 @@ const TemplatesManager = require('./TemplatesManager')
|
||||
const ProjectHelper = require('../Project/ProjectHelper')
|
||||
const logger = require('@overleaf/logger')
|
||||
const { expressify } = require('@overleaf/promise-utils')
|
||||
const SplitTestHandler = require('../SplitTests/SplitTestHandler')
|
||||
|
||||
const TemplatesController = {
|
||||
getV1Template(req, res) {
|
||||
async getV1Template(req, res) {
|
||||
// Read split test assignment so that it's available for Pug to read
|
||||
await SplitTestHandler.promises.getAssignment(req, res, 'core-pug-bs5')
|
||||
|
||||
const templateVersionId = req.params.Template_version_id
|
||||
const templateId = req.query.id
|
||||
if (!/^[0-9]+$/.test(templateVersionId) || !/^[0-9]+$/.test(templateId)) {
|
||||
@@ -25,7 +29,7 @@ const TemplatesController = {
|
||||
mainFile: req.query.mainFile,
|
||||
brandVariationId: req.query.brandVariationId,
|
||||
}
|
||||
return res.render(
|
||||
res.render(
|
||||
path.resolve(
|
||||
__dirname,
|
||||
'../../../views/project/editor/new_from_template'
|
||||
@@ -55,7 +59,7 @@ const TemplatesController = {
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
getV1Template: TemplatesController.getV1Template,
|
||||
getV1Template: expressify(TemplatesController.getV1Template),
|
||||
createProjectFromV1Template: expressify(
|
||||
TemplatesController.createProjectFromV1Template
|
||||
),
|
||||
|
||||
Reference in New Issue
Block a user