Skip to content

Address issues pointed out by @lunny in #3339 #3352

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

Merged
merged 2 commits into from
Jan 12, 2018
Merged

Address issues pointed out by @lunny in #3339 #3352

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0095de2
Address issues pointed out by @lunny in #3339
thehowl Jan 11, 2018
f18f47a
Merge branch 'master' into lunny-review
lafriks Jan 12, 2018
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
11 changes: 4 additions & 7 deletions routers/org/org.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ const (

// Create render the page for create organization
func Create(ctx *context.Context) {
if !ctx.User.CanCreateOrganization() {
ctx.NotFound("CanCreateOrganization", nil)
}

ctx.Data["Title"] = ctx.Tr("new_org")
if !ctx.User.CanCreateOrganization() {
ctx.ServerError("Not allowed", errors.New(ctx.Tr("org.form.create_org_not_allowed")))
Expand All @@ -36,12 +32,13 @@ func Create(ctx *context.Context) {

// CreatePost response for create organization
func CreatePost(ctx *context.Context, form auth.CreateOrgForm) {
ctx.Data["Title"] = ctx.Tr("new_org")

if !ctx.User.CanCreateOrganization() {
ctx.NotFound("CanCreateOrganization", nil)
ctx.ServerError("Not allowed", errors.New(ctx.Tr("org.form.create_org_not_allowed")))
return
}

ctx.Data["Title"] = ctx.Tr("new_org")

if ctx.HasError() {
ctx.HTML(200, tplCreateOrg)
return
Expand Down