Skip to content

Only show new guest note button i if anonymous editing is enabled #734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Only show new guest note button i if anonymous editing is enabled #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions lib/response.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ function responseError (res, code, detail, msg) {
code: code,
detail: detail,
msg: msg,
useCDN: config.usecdn
useCDN: config.usecdn,
allowAnonymousEdits: false,
signin: false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't these newly added options get a useful value instead of being statically set to false?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in their context we only have a response object, res. If that object can allow them to be derived from something -- fine. I was not able to find out what I can derive them from.

As this is just about displaying an error message, I think it is OK to not display the edit/publish buttons but we have to have variables defined to avoid throwing an error in the EJS code that references them.

})
}

Expand Down Expand Up @@ -80,7 +82,7 @@ function showIndex (req, res, next) {
})
}

function responseHackMD (res, note) {
function responseHackMD (req, res, note) {
var body = note.content
var extracted = models.Note.extractMeta(body)
var meta = models.Note.parseMeta(extracted.meta)
Expand Down Expand Up @@ -108,6 +110,7 @@ function responseHackMD (res, note) {
saml: config.isSAMLEnable,
email: config.isEmailEnable,
allowemailregister: config.allowemailregister,
signin: req.isAuthenticated(),
allowpdfexport: config.allowpdfexport
})
}
Expand All @@ -116,7 +119,7 @@ function newNote (req, res, next) {
var owner = null
if (req.isAuthenticated()) {
owner = req.user.id
} else if (!config.allowanonymous) {
} else if (!config.allowanonymousedits) {
return response.errorForbidden(res)
}
models.Note.create({
Expand Down Expand Up @@ -181,7 +184,7 @@ function showNote (req, res, next) {
var noteId = req.params.noteId
var id = LZString.compressToBase64(note.id)
if ((note.alias && noteId !== note.alias) || (!note.alias && noteId !== id)) { return res.redirect(config.serverurl + '/' + (note.alias || id)) }
return responseHackMD(res, note)
return responseHackMD(req, res, note)
})
}

Expand Down Expand Up @@ -215,6 +218,8 @@ function showPublishNote (req, res, next) {
var data = {
title: title,
description: meta.description || (markdown ? models.Note.generateDescription(markdown) : null),
allowAnonymousEdits: config.allowanonymousedits,
signin: req.isAuthenticated(),
viewcount: note.viewcount,
createtime: createtime,
updatetime: updatetime,
Expand Down
4 changes: 4 additions & 0 deletions public/views/hackmd/header.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@
<i class="fa fa-caret-down"></i>
</a>
<ul class="dropdown-menu list" role="menu" aria-labelledby="menu">
<% if(allowAnonymousEdits || signin) { %>
<li role="presentation"><a role="menuitem" class="ui-new" tabindex="-1" href="<%- url %>/new" target="_blank"><i class="fa fa-plus fa-fw"></i> <%= __('New') %></a>
</li>
<li role="presentation"><a role="menuitem" class="ui-publish" tabindex="-1" href="#" target="_blank"><i class="fa fa-share-square-o fa-fw"></i> <%= __('Publish') %></a>
</li>
<% } %>
<li class="divider"></li>
<li class="dropdown-header"><%= __('Extra') %></li>
<li role="presentation"><a role="menuitem" class="ui-extra-revision" tabindex="-1" data-toggle="modal" data-target="#revisionModal"><i class="fa fa-history fa-fw"></i> <%= __('Revision') %></a>
Expand Down Expand Up @@ -118,6 +120,7 @@
</li>
</ul>
<ul class="nav navbar-nav navbar-right" style="padding:0;">
<% if(allowAnonymousEdits || signin) { %>
<li>
<a href="<%- url %>/new" target="_blank" class="ui-new">
<i class="fa fa-plus"></i> <%= __('New') %>
Expand All @@ -128,6 +131,7 @@
<i class="fa fa-share-square-o"></i> <%= __('Publish') %>
</a>
</li>
<% } %>
<li>
<a data-toggle="dropdown">
<%= __('Menu') %> <i class="fa fa-caret-down"></i>
Expand Down
2 changes: 1 addition & 1 deletion public/views/index/body.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<li class="ui-history<% if(signin) { %> active<% } %>"><a href="#"><%= __('History') %></a>
</li>
<div class="ui-signin" style="float: right; margin-top: 8px;<% if(signin) { %> display: none;<% } %>">
<% if(allowAnonymous) { %>
<% if(allowAnonymousEdits) { %>
<a type="button" href="<%- url %>/new" class="btn btn-sm btn-primary"><i class="fa fa-plus"></i> <%= __('New guest note') %></a>
<% } %>
<% if(facebook || twitter || github || gitlab || mattermost || dropbox || google || ldap || saml || email) { %>
Expand Down