Started Implementing User Status

models/user.go

@@ -57,6 +57,7 @@ type User struct {
 	Orgs        []*User       `xorm:"-" json:"-"`
 	Repos       []*Repository `xorm:"-" json:"-"`
 	Location    string
+	Status      string
 	Website     string
 	ThemeColor  string
 	Rands       string `xorm:"VARCHAR(10)"`

pkg/form/admin.go

@@ -29,6 +29,7 @@ type AdminEditUser struct {
 	Password         string `binding:"MaxSize(255)"`
 	Website          string `binding:"MaxSize(50)"`
 	Location         string `binding:"MaxSize(50)"`
+	Status           string `binding:"MaxSize(50)"`
 	StaffNotes       string `binding:"MaxSize(255)"`
 	Twitter          string `binding:"MaxSize(50)"`
 	Linkedin         string `binding:"MaxSize(50)"`
@@ -52,7 +53,6 @@ type AdminEditUser struct {
 	IsBeta           bool
 	IsStaff          bool
 	IsIntern         bool
-	PrivateEmail     bool
 }
 
 func (f *AdminEditUser) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {

pkg/form/user.go

@@ -81,6 +81,7 @@ type UpdateProfile struct {
 	Email        string `binding:"Required;Email;MaxSize(254)"`
 	Website      string `binding:"Url;MaxSize(100)"`
 	Location     string `binding:"MaxSize(50)"`
+	Status       string `binding:"MaxSize(25)"`
 	ThemeColor   string
 	IsBeta       bool
 	ShowSponsors bool

routes/user/setting.go

@@ -52,6 +52,7 @@ func Settings(c *context.Context) {
 	c.Data["email"] = c.User.Email
 	c.Data["website"] = c.User.Website
 	c.Data["location"] = c.User.Location
+	c.Data["status"] = c.User.Status
 	c.Data["themecolor"] = c.User.ThemeColor
 	c.Data["is_beta"] = c.User.IsBeta
 	c.Data["show_sponsors"] = c.User.ShowSponsors
@@ -108,6 +109,7 @@ func SettingsPost(c *context.Context, f form.UpdateProfile) {
 	c.User.Email = f.Email
 	c.User.Website = f.Website
 	c.User.Location = f.Location
+	c.User.Status = f.Status
 	c.User.ThemeColor = f.ThemeColor
 	c.User.IsBeta = f.IsBeta
 	c.User.ShowSponsors = f.ShowSponsors

templates/user/settings/profile.tmpl

@@ -23,6 +23,10 @@
 							<label for="full_name">{{.i18n.Tr "settings.full_name"}}</label>
 							<input id="full_name" name="full_name" value="{{.full_name}}">
 						</div>
+						<div class="field">
+							<label for="status">{{.i18n.Tr "settings.status"}}</label>
+							<input id="status" name="status" value="{{.status}}">
+						</div>
 						<div class="field {{if .Err_Description}}error{{end}}">
 							<label for="description">{{.i18n.Tr "settings.description"}}</label>
 							<textarea id="description" name="description" rows="2">{{.description}}</textarea>