Fix broken Activities link in team dashboard (#17255)

jpraet · web-flow · commit 29acb3213b39 · 2021-10-07T20:27:38.000+02:00
Remove '/' suffix from organization dashboard link Fixes #17250
diff --git a/models/user.go b/models/user.go
@@ -300,7 +300,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
`@@ -300,7 +300,7 @@ func (u *User) CanImportLocal() bool {`
`300`	`300`	`// DashboardLink returns the user dashboard page link.`
`301`	`301`	`func (u *User) DashboardLink() string {`
`302`	`302`	`if u.IsOrganization() {`
`303`		`- return u.OrganisationLink() + "/dashboard/"`
	`303`	`+ return u.OrganisationLink() + "/dashboard"`
`304`	`304`	`}`
`305`	`305`	`return setting.AppSubURL + "/"`
`306`	`306`	`}`