Organization Members Page add "Invite Member" button

options/locale/locale_en-US.ini

@@ -2629,6 +2629,10 @@ members.remove = Remove
 members.remove.detail = Remove %[1]s from %[2]s?
 members.leave = Leave
 members.leave.detail = Leave %s?
+members.invite = Invite
+members.invite_member = Invite Member
+members.to = To
+members.team = Team
 members.invite_desc = Add a new member to %s:
 members.invite_now = Invite Now
 

routers/web/org/members.go

@@ -6,6 +6,7 @@ package org
 
 import (
 	"net/http"
+	"net/url"
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/models/organization"
@@ -14,11 +15,13 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 	shared_user "code.gitea.io/gitea/routers/web/shared/user"
+	org_service "code.gitea.io/gitea/services/org"
 )
 
 const (
 	// tplMembers template for organization members page
-	tplMembers base.TplName = "org/member/members"
+	tplMembers       base.TplName = "org/member/members"
+	tplMembersInvite base.TplName = "org/member/invite"
 )
 
 // Members render organization users page
@@ -76,6 +79,48 @@ func Members(ctx *context.Context) {
 	ctx.HTML(http.StatusOK, tplMembers)
 }
 
+// MembersInvite render organization members invite page
+func MembersInvite(ctx *context.Context) {
+	org := ctx.Org.Organization
+	ctx.Data["Title"] = org.FullName
+	ctx.Data["PageIsOrgMembers"] = true
+	ctx.Data["Teams"] = ctx.Org.Teams
+	ctx.Data["IsEmailInviteEnabled"] = setting.MailService != nil
+	if err := shared_user.LoadHeaderCount(ctx); err != nil {
+		ctx.ServerError("LoadHeaderCount", err)
+		return
+	}
+	ctx.HTML(http.StatusOK, tplMembersInvite)
+}
+
+// MembersInviteAction response for invite a member to organization
+func MembersInviteAction(ctx *context.Context) {
+	var err error
+	if !ctx.Org.IsOwner {
+		ctx.Error(http.StatusNotFound)
+		return
+	}
+	var team *organization.Team
+	team, err = organization.GetTeam(ctx, ctx.Org.Organization.ID, ctx.FormString("team"))
+	if err != nil {
+		if organization.IsErrTeamNotExist(err) {
+			ctx.Flash.Error(ctx.Tr("form.team_not_exist"))
+		} else {
+			ctx.ServerError("GetTeam", err)
+		}
+		return
+	}
+	var isServerError bool
+	isServerError, err = org_service.AddTeamMember(ctx, ctx.Doer, team, ctx.FormString("uname"), ctx.Locale)
+	if isServerError {
+		ctx.ServerError("AddTeamMember", err)
+		return
+	} else if err != nil {
+		ctx.Flash.Error(err.Error())
+	}
+	ctx.Redirect(ctx.Org.OrgLink + "/teams/" + url.PathEscape(team.LowerName))
+}
+
 // MembersAction response for operation to a member of organization
 func MembersAction(ctx *context.Context) {
 	uid := ctx.FormInt64("uid")

routers/web/org/teams.go

@@ -10,7 +10,6 @@ import (
 	"net/url"
 	"path"
 	"strconv"
-	"strings"
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/models/db"
@@ -24,7 +23,6 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/web"
-	"code.gitea.io/gitea/routers/utils"
 	shared_user "code.gitea.io/gitea/routers/web/shared/user"
 	"code.gitea.io/gitea/services/convert"
 	"code.gitea.io/gitea/services/forms"
@@ -127,44 +125,18 @@ func TeamsAction(ctx *context.Context) {
 			ctx.Error(http.StatusNotFound)
 			return
 		}
-		uname := utils.RemoveUsernameParameterSuffix(strings.ToLower(ctx.FormString("uname")))
-		var u *user_model.User
-		u, err = user_model.GetUserByName(ctx, uname)
-		if err != nil {
-			if user_model.IsErrUserNotExist(err) {
-				if setting.MailService != nil && user_model.ValidateEmail(uname) == nil {
-					if err := org_service.CreateTeamInvite(ctx, ctx.Doer, ctx.Org.Team, uname); err != nil {
-						if org_model.IsErrTeamInviteAlreadyExist(err) {
-							ctx.Flash.Error(ctx.Tr("form.duplicate_invite_to_team"))
-						} else if org_model.IsErrUserEmailAlreadyAdded(err) {
-							ctx.Flash.Error(ctx.Tr("org.teams.add_duplicate_users"))
-						} else {
-							ctx.ServerError("CreateTeamInvite", err)
-							return
-						}
-					}
-				} else {
-					ctx.Flash.Error(ctx.Tr("form.user_not_exist"))
-				}
-				ctx.Redirect(ctx.Org.OrgLink + "/teams/" + url.PathEscape(ctx.Org.Team.LowerName))
-			} else {
-				ctx.ServerError("GetUserByName", err)
-			}
-			return
-		}
 
-		if u.IsOrganization() {
-			ctx.Flash.Error(ctx.Tr("form.cannot_add_org_to_team"))
+		var isServerError bool
+		isServerError, err = org_service.AddTeamMember(ctx, ctx.Doer, ctx.Org.Team, ctx.FormString("uname"), ctx.Locale)
+		if !isServerError {
+			ctx.ServerError("AddTeamMember", err)
+			return
+		} else if err != nil {
+			ctx.Flash.Error(err.Error())
 			ctx.Redirect(ctx.Org.OrgLink + "/teams/" + url.PathEscape(ctx.Org.Team.LowerName))
 			return
 		}
 
-		if ctx.Org.Team.IsMember(ctx, u.ID) {
-			ctx.Flash.Error(ctx.Tr("org.teams.add_duplicate_users"))
-		} else {
-			err = models.AddTeamMember(ctx, ctx.Org.Team, u.ID)
-		}
-
 		page = "team"
 	case "remove_invite":
 		if !ctx.Org.IsOwner {

routers/web/web.go

@@ -796,6 +796,8 @@ func registerRoutes(m *web.Route) {
 	m.Group("/org", func() {
 		m.Group("/{org}", func() {
 			m.Get("/members", org.Members)
+			m.Get("/members/invite", org.MembersInvite)
+			m.Post("/members/invite", org.MembersInviteAction)
 		}, context.OrgAssignment())
 	}, ignSignIn)
 

services/org/team_invite.go

@@ -5,9 +5,16 @@ package org
 
 import (
 	"context"
+	"errors"
+	"strings"
 
+	"code.gitea.io/gitea/models"
 	org_model "code.gitea.io/gitea/models/organization"
 	user_model "code.gitea.io/gitea/models/user"
+	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/translation"
+	"code.gitea.io/gitea/routers/utils"
 	"code.gitea.io/gitea/services/mailer"
 )
 
@@ -20,3 +27,43 @@ func CreateTeamInvite(ctx context.Context, inviter *user_model.User, team *org_m
 
 	return mailer.MailTeamInvite(ctx, inviter, team, invite)
 }
+
+// AddTeamMember add user to a team
+func AddTeamMember(ctx context.Context, inviter *user_model.User, team *org_model.Team, username string, locale translation.Locale) (isServerError bool, err error) {
+	uname := utils.RemoveUsernameParameterSuffix(strings.ToLower(username))
+	var u *user_model.User
+	if u, err = user_model.GetUserByName(ctx, uname); err != nil {
+		if user_model.IsErrUserNotExist(err) {
+			if setting.MailService != nil && user_model.ValidateEmail(uname) == nil {
+				if err := CreateTeamInvite(ctx, inviter, team, uname); err != nil {
+					if org_model.IsErrTeamInviteAlreadyExist(err) {
+						return false, errors.New(locale.Tr("form.duplicate_invite_to_team"))
+					} else if org_model.IsErrUserEmailAlreadyAdded(err) {
+						return false, errors.New(locale.Tr("org.teams.add_duplicate_users"))
+					}
+					log.Error("CreateTeamInvite: %v", err)
+					return true, err
+				}
+			} else {
+				err = errors.New(locale.Tr("form.user_not_exist"))
+			}
+		} else {
+			log.Error("GetUserByName: %v", err)
+			return true, err
+		}
+		return false, err
+	}
+
+	if u.IsOrganization() {
+		return false, errors.New(locale.Tr("form.cannot_add_org_to_team"))
+	}
+
+	if team.IsMember(ctx, u.ID) {
+		err = errors.New(locale.Tr("org.teams.add_duplicate_users"))
+	} else {
+		if err = models.AddTeamMember(ctx, team, u.ID); err != nil {
+			return true, err
+		}
+	}
+	return false, err
+}

templates/org/member/invite.tmpl

@@ -0,0 +1,30 @@
+{{template "base/head" .}}
+<div role="main" aria-label="{{.Title}}" class="page-content organization invitemember">
+	{{template "org/header" .}}
+	<div class="ui container">
+		{{template "base/alert" .}}
+
+		<div class="center">
+			<h1 class="ui header">{{ctx.Locale.Tr "org.members.invite_member"}}</h1>
+			<form class="ui form input member-invite" action="{{$.OrgLink}}/members/invite" method="post">
+				<div class="inline field">
+					{{.CsrfTokenHtml}}
+					<input type="hidden" name="uid" value="{{.SignedUser.ID}}">
+					<label>{{ctx.Locale.Tr "org.members.invite"}}</label>
+					<div id="search-user-box" class="ui search input"{{if .IsEmailInviteEnabled}} data-allow-email="true" data-allow-email-description="{{ctx.Locale.Tr "org.members.invite_member"}}"{{end}}>
+						<input class="prompt" name="uname" placeholder="{{ctx.Locale.Tr "repo.settings.search_user_placeholder"}}" autocomplete="off" autofocus required>
+					</div>
+					<label>{{ctx.Locale.Tr "org.members.to"}}</label>
+					<select class="ui selection dropdown" name="team">
+						{{range .Teams}}
+							<option value="{{.LowerName | PathEscape}}">{{.Name}}</option>
+						{{end}}
+					</select>
+					<label>{{ctx.Locale.Tr "org.members.team"}}</label>
+					<button class="ui primary button">{{ctx.Locale.Tr "org.members.invite_now"}}</button>
+				</div>
+			</form>
+		</div>
+	</div>
+</div>
+{{template "base/footer" .}}

templates/org/member/members.tmpl

@@ -1,8 +1,14 @@
 {{template "base/head" .}}
-<div role="main" aria-label="{{.Title}}" class="page-content organization">
+<div role="main" aria-label="{{.Title}}" class="page-content organization members">
 	{{template "org/header" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
+		{{if .IsOrganizationOwner}}
+			<div class="text right">
+				<a class="ui primary button" href="{{.OrgLink}}/members/invite">{{svg "octicon-plus"}} {{ctx.Locale.Tr "org.members.invite_member"}}</a>
+			</div>
+			<div class="divider"></div>
+		{{end}}
 
 		<div class="flex-list">
 			{{range .Members}}

web_src/css/base.css

@@ -193,6 +193,22 @@ a.label,
   text-decoration: none !important;
 }
 
+.ui.search > .prompt {
+  color: var(--color-text);
+  background: var(--color-box-body);
+  border-color: var(--color-secondary);
+}
+
+.ui.search .prompt {
+  border-radius: var(--border-radius);
+}
+
+.ui.search > .prompt:focus {
+  border-color: var(--color-primary);
+  background: var(--color-box-body);
+  color: var(--color-text);
+}
+
 .ui.search > .results {
   background: var(--color-body);
   border-color: var(--color-secondary);
@@ -257,6 +273,8 @@ ol.ui.list li,
 .ui.input.focus > input,
 .ui.input > input:focus {
   border-color: var(--color-primary);
+  background: var(--color-box-body);
+  color: var(--color-text);
 }
 
 .ui.action.input .ui.ui.button {