M .gitignore => .gitignore +1 -0
@@ 19,3 19,4 @@ media
fixtures
static/geo/*
+/scripts
M api/graph/schema.resolvers.go => api/graph/schema.resolvers.go +3 -3
@@ 39,7 39,7 @@ import (
"golang.org/x/image/draw"
"golang.org/x/net/idna"
"netlandish.com/x/gobwebs"
- "netlandish.com/x/gobwebs-oauth2"
+ oauth2 "netlandish.com/x/gobwebs-oauth2"
gaccounts "netlandish.com/x/gobwebs/accounts"
"netlandish.com/x/gobwebs/database"
"netlandish.com/x/gobwebs/email"
@@ 4626,7 4626,7 @@ func (r *queryResolver) GetOrgLinks(ctx context.Context, input *model.GetLinkInp
}
org := orgs[0]
- if user.IsAuthenticated() && (org.CanRead(ctx, user) || org.OwnerID == int(user.ID)) {
+ if user.IsAuthenticated() && org.CanRead(ctx, user) {
linkOpts.Filter = sq.And{
linkOpts.Filter,
sq.Eq{"ol.visibility": []int{
@@ 4641,7 4641,7 @@ func (r *queryResolver) GetOrgLinks(ctx context.Context, input *model.GetLinkInp
}
linkOpts.Filter = sq.And{
linkOpts.Filter,
- sq.Expr("ol.org_id = ?", org.ID),
+ sq.Eq{"ol.org_id": org.ID},
}
} else {
// If not org slug was given we get only the public links
M templates/base.html => templates/base.html +2 -0
@@ 11,6 11,8 @@
<link rel="icon" type="image/png" sizes="32x32" href="{{ staticURL "img/favicon-32x32.png" }}?{{.serverVersion}}" />
<link rel="icon" type="image/png" sizes="16x16" href="{{ staticURL "img/favicon-16x16.png" }}?{{.serverVersion}}" />
<link rel="apple-touch-icon" type="image/png" href="{{ staticURL "img/apple-touch-icon.png" }}?{{.serverVersion}}" />
+ {{ block "seo" }}
+ {{ end }}
{{ block "extrahead" . }}{{ end }}
</head>
<body class="container{{if .hideNav}} full-contaiter{{end}}"{{if or .useTagAutocomplete .advancedSearch}} data-autocomplete="{{reverse "core:tag_autocomplete"}}?org={{.autoCompleteOrgID}}"{{end}}>