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

anon mode: login nav link aligned correctly

Browse source
This commit is contained in:
Harvey Kandola 2016-07-26 14:13:19 -07:00
parent ca027a593d
commit f58ae4ca51
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/app/styles/view/layout.scss
View file

@ -26,7 +26,7 @@
vertical-align: middle; vertical-align: middle;
} }
> .login { > .login {
padding: 15px 0 0 0; padding: 0;
font-size: 1rem; font-size: 1rem;
display: inline-block; display: inline-block;
> a { > a {
@ -125,4 +125,4 @@
font-size: 0.8rem; font-size: 0.8rem;
color: $color-gray; color: $color-gray;
} }
} }

12
core/api/request/document.go
View file

@ -77,9 +77,12 @@ func (p *Persister) GetDocument(id string) (document entity.Document, err error)
func (p *Persister) GetDocumentMeta(id string) (meta entity.DocumentMeta, err error) { func (p *Persister) GetDocumentMeta(id string) (meta entity.DocumentMeta, err error) {
err = nil err = nil
sqlViewers := `SELECT CONVERT_TZ(MAX(a.created), @@session.time_zone, '+00:00') as created, a.userid, u.firstname, u.lastname sqlViewers := `SELECT CONVERT_TZ(MAX(a.created), @@session.time_zone, '+00:00') as created,
IFNULL(a.userid, '') AS userid, IFNULL(u.firstname, '') AS firstname, IFNULL(u.lastname, '') AS lastname
FROM audit a LEFT JOIN user u ON a.userid=u.refid FROM audit a LEFT JOIN user u ON a.userid=u.refid
WHERE a.orgid=? AND a.documentid=? AND a.userid != '0' AND action='get-document' WHERE a.orgid=? AND a.documentid=?
AND a.userid != '0' AND a.userid != ''
AND action='get-document'
GROUP BY a.userid ORDER BY MAX(a.created) DESC` GROUP BY a.userid ORDER BY MAX(a.created) DESC`
err = Db.Select(&meta.Viewers, sqlViewers, p.Context.OrgID, id) err = Db.Select(&meta.Viewers, sqlViewers, p.Context.OrgID, id)
@ -88,11 +91,12 @@ func (p *Persister) GetDocumentMeta(id string) (meta entity.DocumentMeta, err er
log.Error(fmt.Sprintf("Unable to execute select GetDocumentMeta.viewers %s", id), err) log.Error(fmt.Sprintf("Unable to execute select GetDocumentMeta.viewers %s", id), err)
return return
} }
//SELECT CONVERT_TZ(a.created, @@session.time_zone, '+00:00') as //SELECT CONVERT_TZ(a.created, @@session.time_zone, '+00:00') as
sqlEdits := `SELECT CONVERT_TZ(a.created, @@session.time_zone, '+00:00') as created, sqlEdits := `SELECT CONVERT_TZ(a.created, @@session.time_zone, '+00:00') as created,
a.action, a.userid, u.firstname, u.lastname, a.pageid IFNULL(a.action, '') AS action, IFNULL(a.userid, '') AS userid, IFNULL(u.firstname, '') AS firstname, IFNULL(u.lastname, '') AS lastname, IFNULL(a.pageid, '') AS pageid
FROM audit a LEFT JOIN user u ON a.userid=u.refid FROM audit a LEFT JOIN user u ON a.userid=u.refid
WHERE a.orgid=? AND a.documentid=? AND a.userid != '0' WHERE a.orgid=? AND a.documentid=? AND a.userid != '0' AND a.userid != ''
AND (a.action='update-page' OR a.action='add-page' OR a.action='remove-page') AND (a.action='update-page' OR a.action='add-page' OR a.action='remove-page')
ORDER BY a.created DESC;` ORDER BY a.created DESC;`

3
core/product.go
View file

@ -9,7 +9,6 @@
// //
// https://documize.com // https://documize.com
// Package extensions represents Enterprise Edition capabilities.
package core package core
import "fmt" import "fmt"
@ -31,7 +30,7 @@ func Product() (p ProdInfo) {
p.Patch = "0" p.Patch = "0"
p.Version = fmt.Sprintf("%s.%s.%s", p.Major, p.Minor, p.Patch) p.Version = fmt.Sprintf("%s.%s.%s", p.Major, p.Minor, p.Patch)
p.Edition = "Community" p.Edition = "Community"
p.Title = fmt.Sprintf("Documize %s Edition", p.Edition) p.Title = fmt.Sprintf("%s Edition", p.Edition)
return p return p
} }