diff --git a/.gitignore b/.gitignore index c30a2b41..4e852e24 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ testem.log bower.json.ember-try package.json.ember-try embed/bindata_assetfs.go +dmz-backup*.zip diff --git a/core/database/scripts/mysql/db_00025.sql b/core/database/scripts/mysql/db_00025.sql index 81454b8d..5c07ad3d 100644 --- a/core/database/scripts/mysql/db_00025.sql +++ b/core/database/scripts/mysql/db_00025.sql @@ -29,7 +29,6 @@ RENAME TABLE `userevent` TO dmz_audit_log, `useraction` TO dmz_action; - -- field renaming ALTER TABLE dmz_org CHANGE `refid` `c_refid` VARCHAR(20) NOT NULL, @@ -90,7 +89,6 @@ ALTER TABLE dmz_group_member CHANGE `roleid` `c_groupid` VARCHAR(20) NOT NULL, CHANGE `userid` `c_userid` VARCHAR(20) NOT NULL; - ALTER TABLE dmz_permission CHANGE `orgid` `c_orgid` VARCHAR(20) NOT NULL, CHANGE `who` `c_who` VARCHAR(30) NOT NULL, @@ -101,7 +99,6 @@ ALTER TABLE dmz_permission CHANGE `refid` `c_refid` VARCHAR(20) NOT NULL, CHANGE `created` `c_created` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP; - ALTER TABLE dmz_doc CHANGE `refid` `c_refid` VARCHAR(20) NOT NULL, CHANGE `orgid` `c_orgid` VARCHAR(20) NOT NULL, @@ -334,6 +331,5 @@ ALTER TABLE dmz_action CHANGE `created` `c_created` TIMESTAMP DEFAULT CURRENT_TIMESTAMP, CHANGE `revised` `c_revised` TIMESTAMP DEFAULT CURRENT_TIMESTAMP; - -- deprecations DROP TABLE IF EXISTS `participant`; diff --git a/domain/document/store.go b/domain/document/store.go index 0b00c698..6187037c 100644 --- a/domain/document/store.go +++ b/domain/document/store.go @@ -161,10 +161,6 @@ func (s Store) PublicDocuments(ctx domain.RequestContext, orgID string) (documen return } -/* - FROM document d LEFT JOIN label l ON l.refid=d.labelid -*/ - // Update changes the given document record to the new values, updates search information and audits the action. func (s Store) Update(ctx domain.RequestContext, document doc.Document) (err error) { document.Revised = time.Now().UTC() diff --git a/domain/mail/document.go b/domain/mail/document.go index 222e2326..aa283190 100644 --- a/domain/mail/document.go +++ b/domain/mail/document.go @@ -62,6 +62,6 @@ func (m *Mailer) DocumentApprover(recipient, inviterName, inviterEmail, url, doc m.Runtime.Log.Error(fmt.Sprintf("%s - unable to send email", method), err) } if !ok { - m.Runtime.Log.Info(fmt.Sprintf("%s unable to send email")) + m.Runtime.Log.Info(fmt.Sprintf("%s unable to send email", method)) } }