Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-09-18 16:51:06 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #302 from reasonerjt/api-attributes

Browse Source 
role info need to be in user model for now
This commit is contained in:
Daniel Jiang 2016-06-02 12:11:39 +08:00
commit f9f5f7f70a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
models/accesslog.go
View File

@ -29,11 +29,11 @@ type AccessLog struct {
GUID string `orm:"column(GUID)" json:"guid"` GUID string `orm:"column(GUID)" json:"guid"`
Operation string `orm:"column(operation)" json:"operation"` Operation string `orm:"column(operation)" json:"operation"`
OpTime time.Time `orm:"column(op_time)" json:"op_time"` OpTime time.Time `orm:"column(op_time)" json:"op_time"`
Username string Username string `json:"username"`
Keywords string Keywords string `json:"keywords"`
BeginTime time.Time BeginTime time.Time
BeginTimestamp int64 BeginTimestamp int64 `json:"begin_timestamp"`
EndTime time.Time EndTime time.Time
EndTimestamp int64 EndTimestamp int64 `json:"end_timestamp"`
} }

4
models/user.go
View File

@ -28,8 +28,8 @@ type User struct {
Realname string `orm:"column(realname)" json:"realname"` Realname string `orm:"column(realname)" json:"realname"`
Comment string `orm:"column(comment)" json:"comment"` Comment string `orm:"column(comment)" json:"comment"`
Deleted int `orm:"column(deleted)" json:"deleted"` Deleted int `orm:"column(deleted)" json:"deleted"`
// Rolename string `json:role_name` Rolename string `json:role_name`
// RoleID int `json:"role_id"` RoleID int `json:"role_id"`
// RoleList []Role `json:"role_list"` // RoleList []Role `json:"role_list"`
HasAdminRole int `orm:"column(sysadmin_flag)" json:"has_admin_role"` HasAdminRole int `orm:"column(sysadmin_flag)" json:"has_admin_role"`
ResetUUID string `orm:"column(reset_uuid)" json:"reset_uuid"` ResetUUID string `orm:"column(reset_uuid)" json:"reset_uuid"`