4 files changed, 24 insertions, 12 deletions
diff --git a/routers/org/org.go b/routers/org/org.go
index 85bc25217b..98a327a97e 100644
--- a/routers/org/org.go
+++ b/routers/org/org.go
@@ -9,11 +9,12 @@ import (
 	"errors"
 
 	"code.gitea.io/gitea/models"
-	"code.gitea.io/gitea/modules/auth"
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/context"
+	auth "code.gitea.io/gitea/modules/forms"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/web"
 )
 
 const (
@@ -33,7 +34,8 @@ func Create(ctx *context.Context) {
 }
 
 // CreatePost response for create organization
-func CreatePost(ctx *context.Context, form auth.CreateOrgForm) {
+func CreatePost(ctx *context.Context) {
+	form := *web.GetForm(ctx).(*auth.CreateOrgForm)
 	ctx.Data["Title"] = ctx.Tr("new_org")
 
 	if !ctx.User.CanCreateOrganization() {
diff --git a/routers/org/org_labels.go b/routers/org/org_labels.go
index e5b9d9ddee..554f86c964 100644
--- a/routers/org/org_labels.go
+++ b/routers/org/org_labels.go
@@ -6,8 +6,9 @@ package org
 
 import (
 	"code.gitea.io/gitea/models"
-	"code.gitea.io/gitea/modules/auth"
 	"code.gitea.io/gitea/modules/context"
+	auth "code.gitea.io/gitea/modules/forms"
+	"code.gitea.io/gitea/modules/web"
 )
 
 // RetrieveLabels find all the labels of an organization
@@ -26,7 +27,8 @@ func RetrieveLabels(ctx *context.Context) {
 }
 
 // NewLabel create new label for organization
-func NewLabel(ctx *context.Context, form auth.CreateLabelForm) {
+func NewLabel(ctx *context.Context) {
+	form := web.GetForm(ctx).(*auth.CreateLabelForm)
 	ctx.Data["Title"] = ctx.Tr("repo.labels")
 	ctx.Data["PageIsLabels"] = true
 
@@ -50,7 +52,8 @@ func NewLabel(ctx *context.Context, form auth.CreateLabelForm) {
 }
 
 // UpdateLabel update a label's name and color
-func UpdateLabel(ctx *context.Context, form auth.CreateLabelForm) {
+func UpdateLabel(ctx *context.Context) {
+	form := web.GetForm(ctx).(*auth.CreateLabelForm)
 	l, err := models.GetLabelInOrgByID(ctx.Org.Organization.ID, form.ID)
 	if err != nil {
 		switch {
@@ -86,7 +89,8 @@ func DeleteLabel(ctx *context.Context) {
 }
 
 // InitializeLabels init labels for an organization
-func InitializeLabels(ctx *context.Context, form auth.InitializeLabelsForm) {
+func InitializeLabels(ctx *context.Context) {
+	form := web.GetForm(ctx).(*auth.InitializeLabelsForm)
 	if ctx.HasError() {
 		ctx.Redirect(ctx.Repo.RepoLink + "/labels")
 		return
diff --git a/routers/org/setting.go b/routers/org/setting.go
index 05075ca820..ac12066258 100644
--- a/routers/org/setting.go
+++ b/routers/org/setting.go
@@ -9,11 +9,12 @@ import (
 	"strings"
 
 	"code.gitea.io/gitea/models"
-	"code.gitea.io/gitea/modules/auth"
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/context"
+	auth "code.gitea.io/gitea/modules/forms"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/web"
 	userSetting "code.gitea.io/gitea/routers/user/setting"
 )
 
@@ -38,7 +39,8 @@ func Settings(ctx *context.Context) {
 }
 
 // SettingsPost response for settings change submited
-func SettingsPost(ctx *context.Context, form auth.UpdateOrgSettingForm) {
+func SettingsPost(ctx *context.Context) {
+	form := web.GetForm(ctx).(*auth.UpdateOrgSettingForm)
 	ctx.Data["Title"] = ctx.Tr("org.settings")
 	ctx.Data["PageIsSettingsOptions"] = true
 	ctx.Data["CurrentVisibility"] = ctx.Org.Organization.Visibility
@@ -115,7 +117,8 @@ func SettingsPost(ctx *context.Context, form auth.UpdateOrgSettingForm) {
 }
 
 // SettingsAvatar response for change avatar on settings page
-func SettingsAvatar(ctx *context.Context, form auth.AvatarForm) {
+func SettingsAvatar(ctx *context.Context) {
+	form := web.GetForm(ctx).(*auth.AvatarForm)
 	form.Source = auth.AvatarLocal
 	if err := userSetting.UpdateAvatarSetting(ctx, form, ctx.Org.Organization); err != nil {
 		ctx.Flash.Error(err.Error())
diff --git a/routers/org/teams.go b/routers/org/teams.go
index fa98add601..cfa49d4e97 100644
--- a/routers/org/teams.go
+++ b/routers/org/teams.go
@@ -11,10 +11,11 @@ import (
 	"strings"
 
 	"code.gitea.io/gitea/models"
-	"code.gitea.io/gitea/modules/auth"
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/context"
+	auth "code.gitea.io/gitea/modules/forms"
 	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/web"
 	"code.gitea.io/gitea/routers/utils"
 )
 
@@ -186,7 +187,8 @@ func NewTeam(ctx *context.Context) {
 }
 
 // NewTeamPost response for create new team
-func NewTeamPost(ctx *context.Context, form auth.CreateTeamForm) {
+func NewTeamPost(ctx *context.Context) {
+	form := web.GetForm(ctx).(*auth.CreateTeamForm)
 	ctx.Data["Title"] = ctx.Org.Organization.FullName
 	ctx.Data["PageIsOrgTeams"] = true
 	ctx.Data["PageIsOrgTeamsNew"] = true
@@ -274,7 +276,8 @@ func EditTeam(ctx *context.Context) {
 }
 
 // EditTeamPost response for modify team information
-func EditTeamPost(ctx *context.Context, form auth.CreateTeamForm) {
+func EditTeamPost(ctx *context.Context) {
+	form := web.GetForm(ctx).(*auth.CreateTeamForm)
 	t := ctx.Org.Team
 	ctx.Data["Title"] = ctx.Org.Organization.FullName
 	ctx.Data["PageIsOrgTeams"] = true