lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix errors in create org UI regarding team access permission. (#8506)

release/v1.15
David Svantesson 2019-10-14 20:20:42 +02:00 committed by zeripath
parent 54c137b373
commit 366806db32
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/auth/org.go
View File

@ -22,8 +22,9 @@ import (
// CreateOrgForm form for creating organization // CreateOrgForm form for creating organization
type CreateOrgForm struct { type CreateOrgForm struct {
OrgName string `binding:"Required;AlphaDashDot;MaxSize(40)" locale:"org.org_name_holder"` OrgName string `binding:"Required;AlphaDashDot;MaxSize(40)" locale:"org.org_name_holder"`
Visibility structs.VisibleType Visibility structs.VisibleType
RepoAdminChangeTeamAccess bool
} }
// Validate validates the fields // Validate validates the fields

9
routers/org/org.go
View File

@ -47,10 +47,11 @@ func CreatePost(ctx *context.Context, form auth.CreateOrgForm) {
} }
org := &models.User{ org := &models.User{
Name: form.OrgName, Name: form.OrgName,
IsActive: true, IsActive: true,
Type: models.UserTypeOrganization, Type: models.UserTypeOrganization,
Visibility: form.Visibility, Visibility: form.Visibility,
RepoAdminChangeTeamAccess: form.RepoAdminChangeTeamAccess,
} }
if err := models.CreateOrganization(org, ctx.User); err != nil { if err := models.CreateOrganization(org, ctx.User); err != nil {

4
templates/org/create.tmpl
View File

@ -33,9 +33,9 @@
</div> </div>
</div> </div>
<div class="field" id="permission_box"> <div class="inline field" id="permission_box">
<label>{{.i18n.Tr "org.settings.permission"}}</label> <label>{{.i18n.Tr "org.settings.permission"}}</label>
<div class="field"> <div class="inline-grouped-list">
<div class="ui checkbox"> <div class="ui checkbox">
<input class="hidden" type="checkbox" name="repo_admin_change_team_access" checked/> <input class="hidden" type="checkbox" name="repo_admin_change_team_access" checked/>
<label>{{.i18n.Tr "org.settings.repoadminchangeteam"}}</label> <label>{{.i18n.Tr "org.settings.repoadminchangeteam"}}</label>