zias/wolk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

consistency

Browse Source 
Former-commit-id: f0de208a4ae4cd0df9056443fe7a6a823882eca2 [formerly 3c65bde6f2dede145eca8f0d7c10a4d8124a01ef] [formerly 97100fe7d36d445babbc13a669d9c75577cb02d7 [formerly 6e04c97bb9d3e689e583f347588740d2d214e62b]]
Former-commit-id: 30f9afb795307f67cd9bccd2f35742a21ee69fde [formerly bc8a04744ca91ad2f951f0888cc11b023d6a067a]
Former-commit-id: 7397ffff5d09a3a56b29f7119d696ab4a4507893
This commit is contained in:
Henrique Dias
2017-06-27 14:26:12 +01:00
parent 7f28cebda6
commit e151e077c1
11 changed files with 82 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
editor.go
View File

@@ -89,22 +89,22 @@ Error:
// serveSingle serves a single file in an editor (if it is editable), shows the
// plain file, or downloads it if it can't be shown.
func serveSingle(ctx *requestContext, w http.ResponseWriter, r *http.Request) (int, error) {
func serveSingle(c *requestContext, w http.ResponseWriter, r *http.Request) (int, error) {
var err error
if err = ctx.Info.RetrieveFileType(); err != nil {
if err = c.fi.RetrieveFileType(); err != nil {
return errorToHTTP(err, true), err
}
p := &page{
Name: ctx.Info.Name,
Path: ctx.Info.VirtualPath,
Name: c.fi.Name,
Path: c.fi.VirtualPath,
IsDir: false,
Data: ctx.Info,
User: ctx.User,
PrefixURL: ctx.FileManager.prefixURL,
BaseURL: ctx.FileManager.RootURL(),
WebDavURL: ctx.FileManager.WebDavURL(),
Data: c.fi,
User: c.us,
PrefixURL: c.fm.prefixURL,
BaseURL: c.fm.RootURL(),
WebDavURL: c.fm.WebDavURL(),
}
// If the request accepts JSON, we send the file information.
@@ -112,23 +112,23 @@ func serveSingle(ctx *requestContext, w http.ResponseWriter, r *http.Request) (i
return p.PrintAsJSON(w)
}
if ctx.Info.Type == "text" {
if err = ctx.Info.Read(); err != nil {
if c.fi.Type == "text" {
if err = c.fi.Read(); err != nil {
return errorToHTTP(err, true), err
}
}
if ctx.Info.CanBeEdited() && ctx.User.AllowEdit {
p.Data, err = getEditor(r, ctx.Info)
if c.fi.CanBeEdited() && c.us.AllowEdit {
p.Data, err = getEditor(r, c.fi)
p.Editor = true
if err != nil {
return http.StatusInternalServerError, err
}
return p.PrintAsHTML(w, ctx.FileManager.assets.templates, "frontmatter", "editor")
return p.PrintAsHTML(w, c.fm.assets.templates, "frontmatter", "editor")
}
return p.PrintAsHTML(w, ctx.FileManager.assets.templates, "single")
return p.PrintAsHTML(w, c.fm.assets.templates, "single")
}
func editorClass(mode string) string {