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

reusable content block editing completed

Browse source
This commit is contained in:
Harvey Kandola 2017-01-21 17:28:31 -08:00
parent bbc2237ef7
commit 2493a09ba9
15 changed files with 307 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

30
core/api/endpoint/page_endpoint.go
View file

@ -308,14 +308,6 @@ func DeleteDocumentPage(w http.ResponseWriter, r *http.Request) {
p.Context.Transaction = tx
_, err = p.DeletePage(documentID, pageID)
if err != nil {
log.IfErr(tx.Rollback())
writeGeneralSQLError(w, method, err)
return
}
page, err := p.GetPage(pageID)
if err != nil {
log.IfErr(tx.Rollback())
@ -327,6 +319,14 @@ func DeleteDocumentPage(w http.ResponseWriter, r *http.Request) {
p.DecrementBlockUsage(page.BlockID)
}
_, err = p.DeletePage(documentID, pageID)
if err != nil {
log.IfErr(tx.Rollback())
writeGeneralSQLError(w, method, err)
return
}
log.IfErr(tx.Commit())
writeSuccessEmptyJSON(w)
@ -376,13 +376,6 @@ func DeleteDocumentPages(w http.ResponseWriter, r *http.Request) {
p.Context.Transaction = tx
for _, page := range *model {
_, err = p.DeletePage(documentID, page.PageID)
if err != nil {
log.IfErr(tx.Rollback())
writeGeneralSQLError(w, method, err)
return
}
pageData, err := p.GetPage(page.PageID)
if err != nil {
log.IfErr(tx.Rollback())
@ -393,6 +386,13 @@ func DeleteDocumentPages(w http.ResponseWriter, r *http.Request) {
if len(pageData.BlockID) > 0 {
p.DecrementBlockUsage(pageData.BlockID)
}
_, err = p.DeletePage(documentID, page.PageID)
if err != nil {
log.IfErr(tx.Rollback())
writeGeneralSQLError(w, method, err)
return
}
}
log.IfErr(tx.Commit())