1 files changed, 13 insertions, 1 deletions
diff --git a/models/user.go b/models/user.go
index f2fc480e..3d54b79e 100644
--- a/models/user.go
+++ b/models/user.go
@@ -111,8 +111,11 @@ func (u *User) DashboardLink() string {
 	return setting.AppSubUrl + "/"
 }
 
-// HomeLink returns the user home page link.
+// HomeLink returns the user or organization home page link.
 func (u *User) HomeLink() string {
+	if u.IsOrganization() {
+		return setting.AppSubUrl + "/org/" + u.Name
+	}
 	return setting.AppSubUrl + "/" + u.Name
 }
 
@@ -162,6 +165,15 @@ func (u *User) AvatarLink() string {
 	return setting.GravatarSource + u.Avatar
 }
 
+// DisplayName returns full name if it's not empty,
+// returns username otherwise.
+func (u *User) DisplayName() string {
+	if len(u.FullName) > 0 {
+		return u.FullName
+	}
+	return u.Name
+}
+
 // NewGitSig generates and returns the signature of given user.
 func (u *User) NewGitSig() *git.Signature {
 	return &git.Signature{