summaryrefslogtreecommitdiffstats
path: root/models/task.go
diff options
context:
space:
mode:
author6543 <6543@obermui.de>2020-09-11 00:29:19 +0200
committerGitHub <noreply@github.com>2020-09-10 23:29:19 +0100
commitfd60ebfe14927657ff5cfa4e75f975eaadae65f1 (patch)
tree38c3d70146920a13c228fed91bc1a55c9be72436 /models/task.go
parentdaefdd1385d12bf0c8321f291dbb6ab242b41c99 (diff)
downloadgitea-fd60ebfe14927657ff5cfa4e75f975eaadae65f1.tar.gz
gitea-fd60ebfe14927657ff5cfa4e75f975eaadae65f1.zip
[API] Migration: Change ServiceType String (#12672)
* use different structs for MigrateRepoOptions on UI and API * Fix TokenAuth and rename UID to an understandable Name * fix swagger doc * simplify & mk redable * R E F A C T O R: migration has now internal 3 structs to store its options: * the Options for WebUI: modules/auth/repo_form.go * the Options for API: modules/structs/repo.go * the option struct with after validation for internal prossessing: modules/migrations/base/options.go * Copyright Header * Deprecate UID - add RepoOwner * adopt repo.go -> migrate.go * add comment about each struct purpose * lint
Diffstat (limited to 'models/task.go')
-rw-r--r--models/task.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/models/task.go b/models/task.go
index f4fce058c0..43cb2d4d9a 100644
--- a/models/task.go
+++ b/models/task.go
@@ -8,6 +8,7 @@ import (
"encoding/json"
"fmt"
+ migration "code.gitea.io/gitea/modules/migrations/base"
"code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/timeutil"
@@ -101,9 +102,9 @@ func (task *Task) UpdateCols(cols ...string) error {
}
// MigrateConfig returns task config when migrate repository
-func (task *Task) MigrateConfig() (*structs.MigrateRepoOption, error) {
+func (task *Task) MigrateConfig() (*migration.MigrateOptions, error) {
if task.Type == structs.TaskTypeMigrateRepo {
- var opts structs.MigrateRepoOption
+ var opts migration.MigrateOptions
err := json.Unmarshal([]byte(task.PayloadContent), &opts)
if err != nil {
return nil, err