Add bio field for user (#6113)

Fix #4339
tokarchuk/v1.17
techknowlogick 6 years ago committed by GitHub
parent ba2f6a45c8
commit d1c982cb73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      models/user.go
  2. 1
      modules/auth/user_form.go
  3. 1
      options/locale/locale_en-US.ini
  4. 1
      routers/user/setting/profile.go
  5. 6
      templates/user/profile.tmpl
  6. 4
      templates/user/settings/profile.tmpl

@ -104,6 +104,7 @@ type User struct {
Rands string `xorm:"VARCHAR(10)"`
Salt string `xorm:"VARCHAR(10)"`
Language string `xorm:"VARCHAR(5)"`
Description string
CreatedUnix util.TimeStamp `xorm:"INDEX created"`
UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
@ -134,7 +135,6 @@ type User struct {
NumRepos int
// For organization
Description string
NumTeams int
NumMembers int
Teams []*Team `xorm:"-"`

@ -201,6 +201,7 @@ type UpdateProfileForm struct {
Website string `binding:"ValidUrl;MaxSize(255)"`
Location string `binding:"MaxSize(50)"`
Language string `binding:"Size(5)"`
Description string `binding:"MaxSize(255)"`
}
// Validate validates the fields

@ -334,6 +334,7 @@ following = Following
follow = Follow
unfollow = Unfollow
heatmap.loading = Loading Heatmap…
user_bio = Biography
form.name_reserved = The username '%s' is reserved.
form.name_pattern_not_allowed = The pattern '%s' is not allowed in a username.

@ -92,6 +92,7 @@ func ProfilePost(ctx *context.Context, form auth.UpdateProfileForm) {
ctx.User.Website = form.Website
ctx.User.Location = form.Location
ctx.User.Language = form.Language
ctx.User.Description = form.Description
if err := models.UpdateUserSetting(ctx.User); err != nil {
if _, ok := err.(models.ErrEmailAlreadyUsed); ok {
ctx.Flash.Error(ctx.Tr("form.email_been_used"))

@ -34,6 +34,12 @@
<a target="_blank" rel="noopener noreferrer me" href="{{.Owner.Website}}">{{.Owner.Website}}</a>
</li>
{{end}}
{{if .Owner.Description}}
<li>
<i class="octicon octicon-info"></i>
<span>{{.Owner.Description}}</span>
</li>
{{end}}
{{range .OpenIDs}}
{{if .Show}}
<li>

@ -31,6 +31,10 @@
<input name="keep_email_private" type="checkbox" {{if .SignedUser.KeepEmailPrivate}}checked{{end}}>
</div>
</div>
<div class="field {{if .Err_Description}}error{{end}}">
<label for="description">{{$.i18n.Tr "user.user_bio"}}</label>
<textarea id="description" name="description" rows="2">{{.SignedUser.Description}}</textarea>
</div>
<div class="field {{if .Err_Website}}error{{end}}">
<label for="website">{{.i18n.Tr "settings.website"}}</label>
<input id="website" name="website" type="url" value="{{.SignedUser.Website}}">

Loading…
Cancel
Save