upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2025-04-27 21:27:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7143 from wy65701436/fix-robot

Browse Source 
update robot account return attribute
This commit is contained in:
Wenkai Yin 2019-03-15 10:50:25 +08:00 committed by GitHub
commit 7e6de0b596
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/swagger.yaml
View File

@ -4777,7 +4777,7 @@ definitions:
description:
type: string
description: The description of robot account
expiresat:
expires_at:
type: integer
description: The expiration of robot account (in seconds)
project_id:

2
src/common/models/robot.go
View File

@ -29,7 +29,7 @@ type Robot struct {
Name string `orm:"column(name)" json:"name"`
Description string `orm:"column(description)" json:"description"`
ProjectID int64 `orm:"column(project_id)" json:"project_id"`
ExpiresAt int64 `orm:"column(expiresat)" json:"expiresat"`
ExpiresAt int64 `orm:"column(expiresat)" json:"expires_at"`
Disabled bool `orm:"column(disabled)" json:"disabled"`
CreationTime time.Time `orm:"column(creation_time);auto_now_add" json:"creation_time"`
UpdateTime time.Time `orm:"column(update_time);auto_now" json:"update_time"`

2
src/portal/src/app/project/robot-account/robot-account.component.html
View File

@ -51,7 +51,7 @@
<clr-icon shape="check-circle" *ngSwitchCase="false" size="20" class="color-green"></clr-icon>
<clr-icon shape="times-circle" *ngSwitchCase="true" size="16" class="color-red red-position"></clr-icon>
</clr-dg-cell>
<clr-dg-cell>{{r.expiresat * 1000 | date: 'short'}}</clr-dg-cell>
<clr-dg-cell>{{r.expires_at * 1000 | date: 'short'}}</clr-dg-cell>
<clr-dg-cell>{{r.description}}</clr-dg-cell>
</clr-dg-row>
<clr-dg-footer>

2
src/portal/src/app/project/robot-account/robot.ts
View File

@ -3,7 +3,7 @@ export class Robot {
id: number;
name: string;
description: string;
expiresat: number;
expires_at: number;
disabled: boolean;
access: {
isPull: boolean;