diff --git a/models/permission.go b/models/permission.go index e225ca6..bb567ce 100644 --- a/models/permission.go +++ b/models/permission.go @@ -15,6 +15,7 @@ func (r *Permissions) DefaultPermissions() { Permission{Name: "members", Permission: 31}, Permission{Name: "events", Permission: 7}, Permission{Name: "responsible", Permission: 7}, + Permission{Name: "group", Permission: 7}, ) } diff --git a/models/user.go b/models/user.go index 4253174..91a5816 100644 --- a/models/user.go +++ b/models/user.go @@ -5,13 +5,14 @@ import ( ) type User struct { - Id uint `gorm:"primaryKey" json:"id"` - Name string `gorm:"column:user_name" json:"user"` - Email string `gorm:"column:email" json:"email"` - Role string `gorm:"column:role" json:"role,omitempty"` - Password string `gorm:"column:password" json:"password"` - Expiration string `gorm:"column:expiration" json:"expiration,omitempty"` - Settings Settings `gorm:"type:json" json:"settings"` + Id uint `gorm:"primaryKey" json:"id"` + Name string `gorm:"column:user_name" json:"user"` + Email string `gorm:"column:email" json:"email"` + Role string `gorm:"column:role" json:"role,omitempty"` + Password string `gorm:"column:password" json:"password"` + NewPassword string `gorm:"-" json:"newPassword"` + Expiration string `gorm:"column:expiration" json:"expiration,omitempty"` + Settings Settings `gorm:"type:json" json:"settings"` } func (u *User) IsValid() bool {