From 15d37b7a95829e7551d843925fb034bbc613b8f2 Mon Sep 17 00:00:00 2001 From: Martin Hartkorn Date: Sun, 14 Feb 2016 22:40:39 +0100 Subject: Refactored according to suggestions --- routers/repo/setting.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'routers/repo') diff --git a/routers/repo/setting.go b/routers/repo/setting.go index 690e7a46..cb541fc9 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -158,19 +158,18 @@ func SettingsPost(ctx *middleware.Context, form auth.RepoSettingForm) { ctx.Error(404) return } - repo.IsMirror = false - if _, err := models.FinishMigrateRepository(repo, models.RepoPath(ctx.Repo.Owner.Name, repo.Name)); err != nil { + if _, err := models.CleanUpMigrateInfo(repo, models.RepoPath(ctx.Repo.Owner.Name, repo.Name)); err != nil { ctx.RenderWithErr(ctx.Tr("settings.convert.failed"), SETTINGS_OPTIONS, &form) return } - if err := models.UpdateRepository(repo, false); err != nil { + if err := models.UpdateRepository(repo, false); err != nil { ctx.RenderWithErr(ctx.Tr("settings.convert.failed"), SETTINGS_OPTIONS, &form) return } - log.Trace("Repository converted: %s/%s", ctx.Repo.Owner.Name, repo.Name) + log.Trace("Repository converted from mirror to regular: %s/%s", ctx.Repo.Owner.Name, repo.Name) ctx.Flash.Success(ctx.Tr("repo.settings.convert_succeed")) ctx.Redirect(setting.AppSubUrl + "/" + ctx.Repo.Owner.Name + "/" + repo.Name) -- cgit v1.2.3