self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-11 18:24:43 +02:00
Code Issues Releases Activity

Server: Go back to home page when there is an error and user is logged in

Browse Source
This commit is contained in:
Laurent Cozic 2021-05-16 12:19:18 +02:00
parent 2655b6deee
commit a24b0091ad
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/server/src/middleware/routeHandler.ts
View File

@ -52,6 +52,7 @@ export default async function(ctx: AppContext) {
content: { content: {
error, error,
stack: ctx.env === Env.Dev ? error.stack : '', stack: ctx.env === Env.Dev ? error.stack : '',
owner: ctx.owner,
}, },
}; };
ctx.response.body = await mustache().renderView(view); ctx.response.body = await mustache().renderView(view);

7
packages/server/src/views/index/error.mustache
View File

@ -6,6 +6,11 @@
<pre>{{.}}</pre> <pre>{{.}}</pre>
{{/stack}} {{/stack}}
</div> </div>
<p><a href="{{{global.baseUrl}}}/login">Back to the login page</a></p> {{#owner}}
<p><a href="{{{global.baseUrl}}}/home">Back to home page</a></p>
{{/owner}}
{{^owner}}
<p><a href="{{{global.baseUrl}}}/login">Back to login page</a></p>
{{/owner}}
</div> </div>
</div> </div>