diff --git a/domain/activity/mysql/store.go b/domain/activity/mysql/store.go index ccf1941a..4f35b6a2 100644 --- a/domain/activity/mysql/store.go +++ b/domain/activity/mysql/store.go @@ -48,7 +48,7 @@ func (s Scope) RecordUserActivity(ctx domain.RequestContext, activity activity.U func (s Scope) GetDocumentActivity(ctx domain.RequestContext, id string) (a []activity.DocumentActivity, err error) { qry := `SELECT a.id, DATE(a.c_created) AS created, a.c_orgid AS orgid, IFNULL(a.c_userid, '') AS userid, a.c_spaceid AS spaceid, - a.docid AS documentid, a.sectionid AS sectionid, a.c_activitytype AS activitytype, + a.c_docid AS documentid, a.c_sectionid AS sectionid, a.c_activitytype AS activitytype, a.c_metadata AS metadata, IFNULL(u.c_firstname, 'Anonymous') AS firstname, IFNULL(u.c_lastname, 'Viewer') AS lastname, IFNULL(p.c_name, '') AS sectionname diff --git a/domain/document/endpoint.go b/domain/document/endpoint.go index fe251356..9d7bd9c5 100644 --- a/domain/document/endpoint.go +++ b/domain/document/endpoint.go @@ -93,6 +93,7 @@ func (h *Handler) Get(w http.ResponseWriter, r *http.Request) { if err != nil { ctx.Transaction.Rollback() h.Runtime.Log.Error(method, err) + return } ctx.Transaction.Commit() diff --git a/domain/document/mysql/store.go b/domain/document/mysql/store.go index d18f3fcb..cbdbc754 100644 --- a/domain/document/mysql/store.go +++ b/domain/document/mysql/store.go @@ -221,14 +221,14 @@ func (s Scope) Update(ctx domain.RequestContext, document doc.Document) (err err // UpdateGroup applies same values to all documents with the same group ID. func (s Scope) UpdateGroup(ctx domain.RequestContext, d doc.Document) (err error) { - _, err = ctx.Transaction.Exec(`UPDATE dmz_doc SET c_name=?, c_desc? WHERE c_orgid=? AND c_groupid=?`, + _, err = ctx.Transaction.Exec(`UPDATE dmz_doc SET c_name=?, c_desc=? WHERE c_orgid=? AND c_groupid=?`, d.Name, d.Excerpt, ctx.OrgID, d.GroupID) if err == sql.ErrNoRows { err = nil } if err != nil { - err = errors.Wrap(err, "document.store.UpdateTitle") + err = errors.Wrap(err, "document.store.UpdateGroup") } return @@ -347,10 +347,11 @@ func (s Scope) GetVersions(ctx domain.RequestContext, groupID string) (v []doc.V v = []doc.Version{} err = s.Runtime.Db.Select(&v, ` - SELECT c_versionid AS versionid, c_refid as documentid + SELECT c_versionid AS versionid, c_refid As documentid FROM dmz_doc WHERE c_orgid=? AND c_groupid=? - ORDER BY c_versionorder`, ctx.OrgID, groupID) + ORDER BY c_versionorder`, + ctx.OrgID, groupID) if err == sql.ErrNoRows { err = nil