Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migration Tweaks #6260

Merged
merged 15 commits into from
Jun 4, 2019
Merged

Migration Tweaks #6260

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f2e8a01
Adds auto-name if repo name is blank
jolheiser Mar 7, 2019
81af564
Changed err from sanitization to a different variable
jolheiser Mar 7, 2019
9ac7893
Remove handleCreatePost and implement separately
jolheiser Mar 7, 2019
6f87ac2
Make fmt
jolheiser Mar 7, 2019
7f92829
Merge branch 'master' into 6253_migrate_atuo_name_6254_fix_migrate_error
jolheiser Mar 7, 2019
94a7825
Merge branch 'master' into 6253_migrate_atuo_name_6254_fix_migrate_error
jolheiser Mar 7, 2019
a2c6dff
Merge branch 'master' into 6253_migrate_atuo_name_6254_fix_migrate_error
jolheiser Mar 8, 2019
4dfa4b2
Merge branch 'master' into 6253_migrate_atuo_name_6254_fix_migrate_error
jolheiser Mar 8, 2019
9dc6adb
Merge branch 'master' into 6253_migrate_atuo_name_6254_fix_migrate_error
jolheiser Mar 14, 2019
9fa92f4
Merge branch 'master' into 6253_migrate_atuo_name_6254_fix_migrate_error
jolheiser Mar 18, 2019
f266c3c
Merge branch 'master' into 6253_migrate_atuo_name_6254_fix_migrate_error
jolheiser May 2, 2019
3060813
Merge upstream
jolheiser May 23, 2019
ffdfc50
Merge branch 'master' into 6253_migrate_atuo_name_6254_fix_migrate_error
lunny May 24, 2019
58a52e1
Merge branch 'master' into 6253_migrate_atuo_name_6254_fix_migrate_error
lunny May 25, 2019
935f253
Merge branch 'master' into 6253_migrate_atuo_name_6254_fix_migrate_error
jolheiser Jun 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions public/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2136,6 +2136,14 @@ $(document).ready(function () {
break;
}
}

var $cloneAddr = $('#clone_addr');
$cloneAddr.change(function() {
var $repoName = $('#repo_name');
if ($cloneAddr.val().length > 0 && $repoName.val().length === 0) { // Only modify if repo_name input is blank
$repoName.val($cloneAddr.val().match(/^(.*\/)?((.+?)(\.git)?)$/)[3]);
}
});
});

function changeHash(hash) {
Expand Down
49 changes: 29 additions & 20 deletions routers/repo/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,24 +128,6 @@ func Create(ctx *context.Context) {
ctx.HTML(200, tplCreate)
}

func handleCreateError(ctx *context.Context, owner *models.User, err error, name string, tpl base.TplName, form interface{}) {
switch {
case models.IsErrReachLimitOfRepo(err):
ctx.RenderWithErr(ctx.Tr("repo.form.reach_limit_of_creation", owner.MaxCreationLimit()), tpl, form)
case models.IsErrRepoAlreadyExist(err):
ctx.Data["Err_RepoName"] = true
ctx.RenderWithErr(ctx.Tr("form.repo_name_been_taken"), tpl, form)
case models.IsErrNameReserved(err):
ctx.Data["Err_RepoName"] = true
ctx.RenderWithErr(ctx.Tr("repo.form.name_reserved", err.(models.ErrNameReserved).Name), tpl, form)
case models.IsErrNamePatternNotAllowed(err):
ctx.Data["Err_RepoName"] = true
ctx.RenderWithErr(ctx.Tr("repo.form.name_pattern_not_allowed", err.(models.ErrNamePatternNotAllowed).Pattern), tpl, form)
default:
ctx.ServerError(name, err)
}
}

// CreatePost response for creating repository
func CreatePost(ctx *context.Context, form auth.CreateRepoForm) {
ctx.Data["Title"] = ctx.Tr("new_repo")
Expand Down Expand Up @@ -186,7 +168,21 @@ func CreatePost(ctx *context.Context, form auth.CreateRepoForm) {
}
}

handleCreateError(ctx, ctxUser, err, "CreatePost", tplCreate, &form)
switch {
case models.IsErrReachLimitOfRepo(err):
ctx.RenderWithErr(ctx.Tr("repo.form.reach_limit_of_creation", ctxUser.MaxCreationLimit()), tplCreate, form)
case models.IsErrRepoAlreadyExist(err):
ctx.Data["Err_RepoName"] = true
ctx.RenderWithErr(ctx.Tr("form.repo_name_been_taken"), tplCreate, form)
case models.IsErrNameReserved(err):
ctx.Data["Err_RepoName"] = true
ctx.RenderWithErr(ctx.Tr("repo.form.name_reserved", err.(models.ErrNameReserved).Name), tplCreate, form)
case models.IsErrNamePatternNotAllowed(err):
ctx.Data["Err_RepoName"] = true
ctx.RenderWithErr(ctx.Tr("repo.form.name_pattern_not_allowed", err.(models.ErrNamePatternNotAllowed).Pattern), tplCreate, form)
default:
ctx.ServerError("CreatePost", err)
}
}

// Migrate render migration of repository page
Expand Down Expand Up @@ -256,10 +252,23 @@ func MigratePost(ctx *context.Context, form auth.MigrateRepoForm) {
}

if models.IsErrRepoAlreadyExist(err) {
ctx.Data["Err_RepoName"] = true
ctx.RenderWithErr(ctx.Tr("form.repo_name_been_taken"), tplMigrate, &form)
return
}

if models.IsErrNameReserved(err) {
ctx.Data["Err_RepoName"] = true
ctx.RenderWithErr(ctx.Tr("repo.form.name_reserved", err.(models.ErrNameReserved).Name), tplMigrate, &form)
return
}

if models.IsErrNamePatternNotAllowed(err) {
ctx.Data["Err_RepoName"] = true
ctx.RenderWithErr(ctx.Tr("repo.form.name_pattern_not_allowed", err.(models.ErrNamePatternNotAllowed).Pattern), tplMigrate, &form)
return
}

// remoteAddr may contain credentials, so we sanitize it
err = util.URLSanitizedError(err, remoteAddr)

Expand All @@ -280,7 +289,7 @@ func MigratePost(ctx *context.Context, form auth.MigrateRepoForm) {
return
}

handleCreateError(ctx, ctxUser, err, "MigratePost", tplMigrate, &form)
ctx.ServerError("MigratePost", err)
}

// Action response for actions to a repository
Expand Down