#3066 fix create organization ignores full name property

diff --git a/models/org.go b/models/org.go
index 7f659b36a077fcae183973eca963dcefb79242e6..d2cb188935fff80f32f8e6961faf8cd0eb6a61ee 100644 (file)
--- a/models/org.go
+++ b/models/org.go
@@ -106,7 +106,6 @@ func CreateOrganization(org, owner *User) (err error) {
        }
 
        org.LowerName = strings.ToLower(org.Name)
-       org.FullName = org.Name
        org.Rands = GetUserSalt()
        org.Salt = GetUserSalt()
        org.UseCustomAvatar = true

diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index 40b5fb2b63aad392e77ec24e0938b68d4e8da5db..474c8795ab2b66f95ba3acc7e45e873db157d3e2 100644 (file)
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -6,7 +6,7 @@
                                <img class="ui left" id="org-avatar" src="{{.Org.AvatarLink}}?s=140"/>
                                <div id="org-info">
                                        <div class="ui header">
-                                               {{.Org.FullName}}
+                                               {{.Org.DisplayName}}
                                                {{if .IsOrganizationOwner}}<a class="text grey" href="{{.OrgLink}}/settings"><span class="octicon octicon-gear"></span></a>{{end}}
                                        </div>
                                        {{if .Org.Description}}<p class="desc">{{.Org.Description}}</p>{{end}}