mirrors/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-05-18 17:25:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Various refactors to use the new models

Browse source 
Signed-off-by: David Mehren <dmehren1@gmail.com>
This commit is contained in:
David Mehren 2020-04-11 00:05:18 +02:00
parent 4e02f46cee
commit 77e336dfda
No known key found for this signature in database
GPG key ID: 6017AF117F9756CB
3 changed files with 51 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/web/note/slide.ts
View file

@ -1,17 +1,18 @@
import {NextFunction, Response} from "express";
import {NoteUtils} from "./util";
import models from '../../models';
import { NextFunction, Response } from "express";
import { NoteUtils } from "./util";
import errors from '../../errors';
import logger from '../../logger';
import config from '../../config';
import { User } from "../../models/user";
import { Note } from "../../models/note";
export module SlideController{
export function publishSlideActions (req: any, res: Response, next: NextFunction) {
NoteUtils.findNote(req, res, function (note) {
export module SlideController {
export function publishSlideActions(req: any, res: Response, next: NextFunction) {
NoteUtils.findNoteOrCreate(req, res, function (note) {
const action = req.params.action
if (action === 'edit') {
res.redirect(config.serverURL + '/' + (note.alias ? note.alias : models.Note.encodeNoteId(note.id)) + '?both')
res.redirect(config.serverURL + '/' + (note.alias ? note.alias : Note.encodeNoteId(note.id)) + '?both')
} else { res.redirect(config.serverURL + '/p/' + note.shortid) }
})
}
@ -20,13 +21,13 @@ export module SlideController{
export function showPublishSlide(req: any, res: Response, next: NextFunction) {
const include = [{
model: models.User,
model: User,
as: 'owner'
}, {
model: models.User,
model: User,
as: 'lastchangeuser'
}]
NoteUtils.findNote(req, res, function (note) {
NoteUtils.findNoteOrCreate(req, res, function (note) {
// force to use short id
const shortid = req.params.shortid
if ((note.alias && shortid !== note.alias) || (!note.alias && shortid !== note.shortid)) {