luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Person: Revert previous commit

Browse source 
EulaSigned might cause confusion as it's commonly used for proprietary software.

Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2020-09-17 19:20:12 +02:00
parent 48ec25bcba
commit dc8640ca2b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/model/user.js
View file

@ -63,6 +63,7 @@ export class User extends RestModel {
BirthDay: -1,
UserName: "",
UserSettings: "",
TermsAccepted: false,
IsActive: false,
IsConfirmed: false,
IsArtist: false,
@ -74,7 +75,6 @@ export class User extends RestModel {
RoleFriend: false,
WebDAV: false,
StoragePath: "",
EulaSigned: "",
CreatedAt: "",
UpdatedAt: "",
};

2
internal/entity/person.go
View file

@ -44,6 +44,7 @@ type Person struct {
BirthDay int `json:"BirthDay" yaml:"BirthDay,omitempty"`
UserName string `gorm:"size:64;" json:"UserName" yaml:"UserName,omitempty"`
UserSettings string `gorm:"type:LONGTEXT;" json:"-" yaml:"-"`
TermsAccepted bool `json:"TermsAccepted" yaml:"TermsAccepted,omitempty"`
IsActive bool `json:"IsActive" yaml:"IsActive,omitempty"`
IsConfirmed bool `json:"IsConfirmed" yaml:"IsConfirmed,omitempty"`
IsArtist bool `json:"IsArtist" yaml:"IsArtist,omitempty"`
@ -61,7 +62,6 @@ type Person struct {
ApiSecret string `gorm:"column:api_secret;type:VARBINARY(128);" json:"-" yaml:"-"`
LoginAttempts int `json:"-" yaml:"-"`
LoginAt *time.Time `json:"-" yaml:"-"`
EulaSigned *time.Time `json:"EulaSigned" yaml:"EulaSigned,omitempty"`
CreatedAt time.Time `json:"CreatedAt" yaml:"-"`
UpdatedAt time.Time `json:"UpdatedAt" yaml:"-"`
DeletedAt *time.Time `sql:"index" json:"DeletedAt,omitempty" yaml:"-"`