Просмотр исходного кода

#3066 fix create organization ignores full name property

Unknwon лет назад: 7
Родитель
Сommit
4f78abe7dc
2 измененных файлов с 1 добавлено и 2 удалено
  1. 0 1
      models/org.go
  2. 1 1
      templates/org/home.tmpl

+ 0 - 1
models/org.go

@@ -106,7 +106,6 @@ func CreateOrganization(org, owner *User) (err error) {
 	}
 	}
 
 
 	org.LowerName = strings.ToLower(org.Name)
 	org.LowerName = strings.ToLower(org.Name)
-	org.FullName = org.Name
 	org.Rands = GetUserSalt()
 	org.Rands = GetUserSalt()
 	org.Salt = GetUserSalt()
 	org.Salt = GetUserSalt()
 	org.UseCustomAvatar = true
 	org.UseCustomAvatar = true

+ 1 - 1
templates/org/home.tmpl

@@ -6,7 +6,7 @@
 				<img class="ui left" id="org-avatar" src="{{.Org.AvatarLink}}?s=140"/>
 				<img class="ui left" id="org-avatar" src="{{.Org.AvatarLink}}?s=140"/>
 				<div id="org-info">
 				<div id="org-info">
 					<div class="ui header">
 					<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}}
 						{{if .IsOrganizationOwner}}<a class="text grey" href="{{.OrgLink}}/settings"><span class="octicon octicon-gear"></span></a>{{end}}
 					</div>
 					</div>
 					{{if .Org.Description}}<p class="desc">{{.Org.Description}}</p>{{end}}
 					{{if .Org.Description}}<p class="desc">{{.Org.Description}}</p>{{end}}