Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-21 22:29:41 +02:00
Code Releases Activity

Include new comment fields in backup/restore process

Browse source 
c_sectionid
c_replyto
This commit is contained in:
HarveyKandola 2019-06-12 13:52:30 +01:00
parent 216866a953
commit 64612b825a
5 changed files with 1101 additions and 1107 deletions
Download patch file Download diff file Expand all files Collapse all files

3
domain/backup/backup.go
View file

@ -733,7 +733,8 @@ func (b backerHandler) dmzDocument(files *[]backupItem) (err error) {
err = b.Runtime.Db.Select(&cm, ` err = b.Runtime.Db.Select(&cm, `
SELECT c_refid AS refid, c_orgid AS orgid, c_docid AS documentid, SELECT c_refid AS refid, c_orgid AS orgid, c_docid AS documentid,
c_userid AS userid, c_email AS email, c_userid AS userid, c_email AS email,
c_feedback AS feedback, c_created AS created c_feedback AS feedback, c_sectionid AS sectionid, c_replyto AS replyto,
c_created AS created
FROM dmz_doc_comment`+w) FROM dmz_doc_comment`+w)
if err != nil { if err != nil {
return errors.Wrap(err, "select.doccomment") return errors.Wrap(err, "select.doccomment")

2
domain/backup/models.go
View file

@ -59,6 +59,8 @@ type comment struct {
UserID string `json:"userId"` UserID string `json:"userId"`
Email string `json:"email"` Email string `json:"email"`
Feedback string `json:"feedback"` Feedback string `json:"feedback"`
SectionID string `json:"sectionId"`
ReplyTo string `json:"replyTo"`
Created time.Time `json:"created"` Created time.Time `json:"created"`
} }

16
domain/backup/restore.go
View file

@ -1551,15 +1551,6 @@ func (r *restoreHandler) dmzDocAttachment() (err error) {
func (r *restoreHandler) dmzDocComment() (err error) { func (r *restoreHandler) dmzDocComment() (err error) {
filename := "dmz_doc_comment.json" filename := "dmz_doc_comment.json"
type comment struct {
RefID string `json:"feedbackId"`
OrgID string `json:"orgId"`
DocumentID string `json:"documentId"`
UserID string `json:"userId"`
Email string `json:"email"`
Feedback string `json:"feedback"`
Created time.Time `json:"created"`
}
cm := []comment{} cm := []comment{}
err = r.fileJSON(filename, &cm) err = r.fileJSON(filename, &cm)
if err != nil { if err != nil {
@ -1590,10 +1581,10 @@ func (r *restoreHandler) dmzDocComment() (err error) {
for i := range cm { for i := range cm {
_, err = r.Context.Transaction.Exec(r.Runtime.Db.Rebind(` _, err = r.Context.Transaction.Exec(r.Runtime.Db.Rebind(`
INSERT INTO dmz_doc_comment INSERT INTO dmz_doc_comment
(c_refid, c_orgid, c_userid, c_docid, c_email, c_feedback, c_created) (c_refid, c_orgid, c_userid, c_docid, c_email, c_feedback, c_replyto, c_sectionid, c_created)
VALUES (?, ?, ?, ?, ?, ?, ?)`), VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`),
cm[i].RefID, r.remapOrg(cm[i].OrgID), r.remapUser(cm[i].UserID), cm[i].DocumentID, cm[i].RefID, r.remapOrg(cm[i].OrgID), r.remapUser(cm[i].UserID), cm[i].DocumentID,
cm[i].Email, cm[i].Feedback, cm[i].Created) cm[i].Email, cm[i].Feedback, cm[i].ReplyTo, cm[i].SectionID, cm[i].Created)
if err != nil { if err != nil {
r.Context.Transaction.Rollback() r.Context.Transaction.Rollback()
@ -1727,6 +1718,7 @@ func (r *restoreHandler) dmzUser() (err error) {
insert = true insert = true
} }
if err != nil { if err != nil {
r.Context.Transaction.Rollback()
err = errors.Wrap(err, fmt.Sprintf("unable to check email %s", u[i].Email)) err = errors.Wrap(err, fmt.Sprintf("unable to check email %s", u[i].Email))
return return
} }

2184
embed/bindata.go
View file

File diff suppressed because one or more lines are too long

3
gui/app/styles/core/view/document/meta.scss
View file

@ -159,7 +159,6 @@
font-weight: 500; font-weight: 500;
background-color: map-get($gray-shades, 800); background-color: map-get($gray-shades, 800);
color: map-get($gray-shades, 100); color: map-get($gray-shades, 100);
text-transform: uppercase;
} }
> .version-dropdown { > .version-dropdown {
@ -184,7 +183,7 @@
} }
> .dates { > .dates {
margin-bottom: 3rem; margin-bottom: 2rem;
font-size: 0.9rem; font-size: 0.9rem;
font-weight: 300; font-weight: 300;
color: map-get($gray-shades, 700); color: map-get($gray-shades, 700);