Fix broken Activities link in team dashboard (#17255) (#17258)

jpraet · web-flow · commit 6e0a08d75350 · 2021-10-07T20:58:59.000+02:00
Remove '/' suffix from organization dashboard link Fixes #17250
diff --git a/models/user.go b/models/user.go
@@ -296,7 +296,7 @@ func (u *User) CanImportLocal() bool {
 // DashboardLink returns the user dashboard page link.
 func (u *User) DashboardLink() string {
 	if u.IsOrganization() {
-		return u.OrganisationLink() + "/dashboard/"
+		return u.OrganisationLink() + "/dashboard"
 	}
 	return setting.AppSubURL + "/"
 }

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ func (u *User) CanImportLocal() bool {`
`296`	`296`	`// DashboardLink returns the user dashboard page link.`
`297`	`297`	`func (u *User) DashboardLink() string {`
`298`	`298`	`if u.IsOrganization() {`
`299`		`- return u.OrganisationLink() + "/dashboard/"`
	`299`	`+ return u.OrganisationLink() + "/dashboard"`
`300`	`300`	`}`
`301`	`301`	`return setting.AppSubURL + "/"`
`302`	`302`	`}`