diff options
Diffstat (limited to 'routers/api')
| -rw-r--r-- | routers/api/v1/convert/convert.go | 14 | ||||
| -rw-r--r-- | routers/api/v1/repo/milestone.go | 11 | ||||
| -rw-r--r-- | routers/api/v1/user/watch.go | 4 |
3 files changed, 15 insertions, 14 deletions
diff --git a/routers/api/v1/convert/convert.go b/routers/api/v1/convert/convert.go index b5aad95a9c..1bfd7f1ff0 100644 --- a/routers/api/v1/convert/convert.go +++ b/routers/api/v1/convert/convert.go @@ -82,7 +82,7 @@ func ToPublicKey(apiLink string, key *models.PublicKey) *api.PublicKey { URL: apiLink + com.ToStr(key.ID), Title: key.Name, Fingerprint: key.Fingerprint, - Created: key.Created, + Created: key.CreatedUnix.AsTime(), } } @@ -95,8 +95,8 @@ func ToGPGKey(key *models.GPGKey) *api.GPGKey { PrimaryKeyID: k.PrimaryKeyID, KeyID: k.KeyID, PublicKey: k.Content, - Created: k.Created, - Expires: k.Expired, + Created: k.CreatedUnix.AsTime(), + Expires: k.ExpiredUnix.AsTime(), CanSign: k.CanSign, CanEncryptComms: k.CanEncryptComms, CanEncryptStorage: k.CanEncryptStorage, @@ -112,8 +112,8 @@ func ToGPGKey(key *models.GPGKey) *api.GPGKey { PrimaryKeyID: key.PrimaryKeyID, KeyID: key.KeyID, PublicKey: key.Content, - Created: key.Created, - Expires: key.Expired, + Created: key.CreatedUnix.AsTime(), + Expires: key.ExpiredUnix.AsTime(), Emails: emails, SubsKey: subkeys, CanSign: key.CanSign, @@ -152,8 +152,8 @@ func ToHook(repoLink string, w *models.Webhook) *api.Hook { Active: w.IsActive, Config: config, Events: w.EventsArray(), - Updated: w.Updated, - Created: w.Created, + Updated: w.UpdatedUnix.AsTime(), + Created: w.CreatedUnix.AsTime(), } } diff --git a/routers/api/v1/repo/milestone.go b/routers/api/v1/repo/milestone.go index 0e597a9db0..29bab67ac5 100644 --- a/routers/api/v1/repo/milestone.go +++ b/routers/api/v1/repo/milestone.go @@ -11,6 +11,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/util" ) // ListMilestones list all the milestones for a repository @@ -118,10 +119,10 @@ func CreateMilestone(ctx *context.APIContext, form api.CreateMilestoneOption) { } milestone := &models.Milestone{ - RepoID: ctx.Repo.Repository.ID, - Name: form.Title, - Content: form.Description, - Deadline: *form.Deadline, + RepoID: ctx.Repo.Repository.ID, + Name: form.Title, + Content: form.Description, + DeadlineUnix: util.TimeStamp(form.Deadline.Unix()), } if err := models.NewMilestone(milestone); err != nil { @@ -175,7 +176,7 @@ func EditMilestone(ctx *context.APIContext, form api.EditMilestoneOption) { milestone.Content = *form.Description } if form.Deadline != nil && !form.Deadline.IsZero() { - milestone.Deadline = *form.Deadline + milestone.DeadlineUnix = util.TimeStamp(form.Deadline.Unix()) } if err := models.UpdateMilestone(milestone); err != nil { diff --git a/routers/api/v1/user/watch.go b/routers/api/v1/user/watch.go index b10831f5f2..af7b9b4cca 100644 --- a/routers/api/v1/user/watch.go +++ b/routers/api/v1/user/watch.go @@ -97,7 +97,7 @@ func IsWatching(ctx *context.APIContext) { Subscribed: true, Ignored: false, Reason: nil, - CreatedAt: ctx.Repo.Repository.Created, + CreatedAt: ctx.Repo.Repository.CreatedUnix.AsTime(), URL: subscriptionURL(ctx.Repo.Repository), RepositoryURL: repositoryURL(ctx.Repo.Repository), }) @@ -134,7 +134,7 @@ func Watch(ctx *context.APIContext) { Subscribed: true, Ignored: false, Reason: nil, - CreatedAt: ctx.Repo.Repository.Created, + CreatedAt: ctx.Repo.Repository.CreatedUnix.AsTime(), URL: subscriptionURL(ctx.Repo.Repository), RepositoryURL: repositoryURL(ctx.Repo.Repository), }) |