Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-24 15:49:44 +02:00
Code Releases Activity

new document commit tweak

Browse source
This commit is contained in:
Harvey Kandola 2017-08-18 14:31:36 +01:00
parent adbe93a28a
commit 17db964b10
2 changed files with 638 additions and 636 deletions
Download patch file Download diff file Expand all files Collapse all files

10
domain/conversion/conversion.go
View file

@ -19,6 +19,8 @@ import (
"net/http"
"strings"
"github.com/documize/community/core/env"
api "github.com/documize/community/core/convapi"
"github.com/documize/community/core/request"
"github.com/documize/community/core/response"
@ -139,7 +141,7 @@ func (h *Handler) convert(w http.ResponseWriter, r *http.Request, job, folderID
return
}
nd, err := processDocument(ctx, h.Store, filename, job, folderID, fileResult)
nd, err := processDocument(ctx, h.Runtime, h.Store, filename, job, folderID, fileResult)
if err != nil {
response.WriteServerError(w, method, err)
h.Runtime.Log.Error(method, err)
@ -152,7 +154,7 @@ func (h *Handler) convert(w http.ResponseWriter, r *http.Request, job, folderID
response.WriteJSON(w, nd)
}
func processDocument(ctx domain.RequestContext, store *domain.Store, filename, job, folderID string, fileResult *api.DocumentConversionResponse) (newDocument doc.Document, err error) {
func processDocument(ctx domain.RequestContext, r *env.Runtime, store *domain.Store, filename, job, folderID string, fileResult *api.DocumentConversionResponse) (newDocument doc.Document, err error) {
// Convert into database objects
document := convertFileResult(filename, fileResult)
document.Job = job
@ -222,6 +224,8 @@ func processDocument(ctx domain.RequestContext, store *domain.Store, filename, j
}
}
ctx.Transaction.Commit()
newDocument, err = store.Document.Get(ctx, documentID)
if err != nil {
ctx.Transaction.Rollback()
@ -244,8 +248,6 @@ func processDocument(ctx domain.RequestContext, store *domain.Store, filename, j
store.Audit.Record(ctx, audit.EventTypeDocumentUpload)
ctx.Transaction.Commit()
return
}

1264
embed/bindata_assetfs.go
View file

File diff suppressed because one or more lines are too long