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

Person: Rename optional UserUUID to GlobalUID #98 #144

Browse Source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2020-09-16 15:35:35 +02:00
parent 2d1cfcde73
commit d18414e468
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ export class User extends RestModel {
UID: "",
Address: {},
ParentUID: "",
UUID: "",
GlobalUID: "",
UserName: "",
DisplayName: "",
DisplayLocation: "",

2
internal/entity/address.go
View File

@ -11,7 +11,7 @@ type Addresses []Address
type Address struct {
ID int `gorm:"primary_key" json:"ID" yaml:"ID"`
CellID string `gorm:"type:VARBINARY(42);index;default:'zz'" json:"CellID" yaml:"CellID"`
AddressUUID string `gorm:"type:VARBINARY(42);index;" json:"UUID" yaml:"UUID,omitempty"`
GlobalUID string `gorm:"type:VARBINARY(42);index;" json:"GlobalUID" yaml:"GlobalUID,omitempty"`
AddressLat float32 `gorm:"type:FLOAT;index;" json:"Lat" yaml:"Lat,omitempty"`
AddressLng float32 `gorm:"type:FLOAT;index;" json:"Lng" yaml:"Lng,omitempty"`
AddressLine1 string `gorm:"size:255;" json:"Line1" yaml:"Line1,omitempty"`

2
internal/entity/person.go
View File

@ -19,7 +19,7 @@ type Person struct {
AddressID int `gorm:"default:1" json:"-" yaml:"-"`
PersonUID string `gorm:"type:VARBINARY(42);unique_index;" json:"UID" yaml:"UID"`
ParentUID string `gorm:"type:VARBINARY(42);" json:"ParentUID" yaml:"ParentUID,omitempty"`
UserUUID string `gorm:"type:VARBINARY(42);index;" json:"UUID" yaml:"UUID,omitempty"`
GlobalUID string `gorm:"type:VARBINARY(42);index;" json:"GlobalUID" yaml:"GlobalUID,omitempty"`
UserName string `gorm:"size:64;" json:"UserName" yaml:"UserName,omitempty"`
DisplayName string `gorm:"size:128;" json:"DisplayName" yaml:"DisplayName,omitempty"`
DisplayLocation string `gorm:"size:128;" json:"DisplayLocation" yaml:"DisplayLocation,omitempty"`