Fix push mirror, wrong timestamp format (#27153)
I noticed, that the push mirrors endpoint, is the only endpoint which returns the times in long format rather than as time.Time(). I think the behavior should be consistent across the project. ---- ## ⚠️ BREAKING ⚠️ This PR changes the time format used in API responses for all push_mirror endpoints which return a push mirror. --------- Co-authored-by: Giteabot <teabot@gitea.io>
This commit is contained in:
parent
5f7388e586
commit
0ee7cbf725
3 changed files with 16 additions and 10 deletions
|
@ -3,6 +3,8 @@
|
||||||
|
|
||||||
package structs
|
package structs
|
||||||
|
|
||||||
|
import "time"
|
||||||
|
|
||||||
// CreatePushMirrorOption represents need information to create a push mirror of a repository.
|
// CreatePushMirrorOption represents need information to create a push mirror of a repository.
|
||||||
type CreatePushMirrorOption struct {
|
type CreatePushMirrorOption struct {
|
||||||
RemoteAddress string `json:"remote_address"`
|
RemoteAddress string `json:"remote_address"`
|
||||||
|
@ -18,8 +20,10 @@ type PushMirror struct {
|
||||||
RepoName string `json:"repo_name"`
|
RepoName string `json:"repo_name"`
|
||||||
RemoteName string `json:"remote_name"`
|
RemoteName string `json:"remote_name"`
|
||||||
RemoteAddress string `json:"remote_address"`
|
RemoteAddress string `json:"remote_address"`
|
||||||
CreatedUnix string `json:"created"`
|
// swagger:strfmt date-time
|
||||||
LastUpdateUnix string `json:"last_update"`
|
CreatedUnix time.Time `json:"created"`
|
||||||
|
// swagger:strfmt date-time
|
||||||
|
LastUpdateUnix *time.Time `json:"last_update"`
|
||||||
LastError string `json:"last_error"`
|
LastError string `json:"last_error"`
|
||||||
Interval string `json:"interval"`
|
Interval string `json:"interval"`
|
||||||
SyncOnCommit bool `json:"sync_on_commit"`
|
SyncOnCommit bool `json:"sync_on_commit"`
|
||||||
|
|
|
@ -15,8 +15,8 @@ func ToPushMirror(pm *repo_model.PushMirror) (*api.PushMirror, error) {
|
||||||
RepoName: repo.Name,
|
RepoName: repo.Name,
|
||||||
RemoteName: pm.RemoteName,
|
RemoteName: pm.RemoteName,
|
||||||
RemoteAddress: pm.RemoteAddress,
|
RemoteAddress: pm.RemoteAddress,
|
||||||
CreatedUnix: pm.CreatedUnix.FormatLong(),
|
CreatedUnix: pm.CreatedUnix.AsTime(),
|
||||||
LastUpdateUnix: pm.LastUpdateUnix.FormatLong(),
|
LastUpdateUnix: pm.LastUpdateUnix.AsTimePtr(),
|
||||||
LastError: pm.LastError,
|
LastError: pm.LastError,
|
||||||
Interval: pm.Interval.String(),
|
Interval: pm.Interval.String(),
|
||||||
SyncOnCommit: pm.SyncOnCommit,
|
SyncOnCommit: pm.SyncOnCommit,
|
||||||
|
|
2
templates/swagger/v1_json.tmpl
generated
2
templates/swagger/v1_json.tmpl
generated
|
@ -21646,6 +21646,7 @@
|
||||||
"properties": {
|
"properties": {
|
||||||
"created": {
|
"created": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
|
"format": "date-time",
|
||||||
"x-go-name": "CreatedUnix"
|
"x-go-name": "CreatedUnix"
|
||||||
},
|
},
|
||||||
"interval": {
|
"interval": {
|
||||||
|
@ -21658,6 +21659,7 @@
|
||||||
},
|
},
|
||||||
"last_update": {
|
"last_update": {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
|
"format": "date-time",
|
||||||
"x-go-name": "LastUpdateUnix"
|
"x-go-name": "LastUpdateUnix"
|
||||||
},
|
},
|
||||||
"remote_address": {
|
"remote_address": {
|
||||||
|
|
Loading…
Add table
Reference in a new issue