johanels/photoprism
1
0
Fork 0
mirror of https://github.com/photoprism/photoprism.git synced 2025-12-12 00:34:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Albums: Fix generation of site URL when opening a share link #3658

Browse Source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer
2023-08-21 11:29:41 +02:00
parent 5c7f8d1726
commit 2e367870a9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/api/auth_share.go → internal/api/share.go
View File

@@ -29,7 +29,7 @@ func Shares(router *gin.RouterGroup) {
} }
clientConfig := conf.ClientShare() clientConfig := conf.ClientShare()
clientConfig.SiteUrl = path.Join(clientConfig.SiteUrl, "s", token) clientConfig.SiteUrl = clientConfig.SiteUrl + path.Join("s", token)
uri := conf.BaseUri("/library/albums") uri := conf.BaseUri("/library/albums")
c.HTML(http.StatusOK, "share.gohtml", gin.H{"shared": gin.H{"token": token, "uri": uri}, "config": clientConfig}) c.HTML(http.StatusOK, "share.gohtml", gin.H{"shared": gin.H{"token": token, "uri": uri}, "config": clientConfig})
@@ -51,8 +51,8 @@ func Shares(router *gin.RouterGroup) {
uid := links[0].ShareUID uid := links[0].ShareUID
clientConfig := conf.ClientShare() clientConfig := conf.ClientShare()
clientConfig.SiteUrl = path.Join(clientConfig.SiteUrl, "s", token, uid) clientConfig.SiteUrl = clientConfig.SiteUrl + path.Join("s", token, uid)
clientConfig.SitePreview = path.Join(clientConfig.SiteUrl, "preview") clientConfig.SitePreview = clientConfig.SiteUrl + "/preview"
if a, err := query.AlbumByUID(uid); err == nil { if a, err := query.AlbumByUID(uid); err == nil {
clientConfig.SiteCaption = a.AlbumTitle clientConfig.SiteCaption = a.AlbumTitle

0
internal/api/auth_share_test.go → internal/api/share_test.go
View File