diff --git a/models/user/contributor_agreement.go b/models/user/contributor_agreement.go new file mode 100644 index 0000000000000..c2c4f550ffd81 --- /dev/null +++ b/models/user/contributor_agreement.go @@ -0,0 +1,62 @@ +// Copyright 2025 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +// BLENDER: contributor agreement + +package user + +import ( + "code.gitea.io/gitea/models/db" + "code.gitea.io/gitea/modules/timeutil" + + "xorm.io/builder" +) + +type ContributorAgreement struct { + ID int64 `xorm:"pk autoincr"` + Slug string `xorm:"UNIQUE"` + CreatedUnix timeutil.TimeStamp `xorm:"created"` + Content string `xorm:"TEXT NOT NULL"` +} + +type SignedContributorAgreement struct { + ID int64 `xorm:"pk autoincr"` + UserID int64 `xorm:"UNIQUE(s)"` + ContributorAgreementID int64 `xorm:"UNIQUE(s)"` + CreatedUnix timeutil.TimeStamp `xorm:"created"` + Comment string `xorm:"TEXT DEFAULT NULL"` +} + +type FindSignedContributorAgreementsOptions struct { + db.ListOptions + ContributorAgreementID int64 + UserID int64 + UserIDs []int64 +} + +func (opts *FindSignedContributorAgreementsOptions) ToConds() builder.Cond { + cond := builder.NewCond() + if opts.ContributorAgreementID != 0 { + cond = cond.And(builder.Eq{"contributor_agreement_id": opts.ContributorAgreementID}) + } + if opts.UserID != 0 { + cond = cond.And(builder.Eq{"user_id": opts.UserID}) + } + if opts.UserIDs != nil { + cond = cond.And(builder.In("user_id", opts.UserIDs)) + } + return cond +} + +func (opts *FindSignedContributorAgreementsOptions) ToOrders() string { + return "id DESC" +} + +func init() { + // These tables don't exist in the upstream code. + // We don't introduce migrations for it to avoid migration id clashes. + // Gitea will create the tables in the database during startup, + // so no manual action is required until we start modifying the tables. + db.RegisterModel(new(ContributorAgreement)) + db.RegisterModel(new(SignedContributorAgreement)) +} diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index edefec2fce636..5810b6e8785cb 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -750,6 +750,7 @@ account_link = Linked Accounts organization = Organizations uid = UID webauthn = Two-Factor Authentication (Security Keys) +contributor_agreements = Contributor Agreements public_profile = Public Profile biography_placeholder = Tell us a little bit about yourself! (You can use Markdown) @@ -3008,6 +3009,7 @@ last_page = Last total = Total: %d settings = Admin Settings spamreports = Spam Reports +signed_contributor_agreements = Signed CLA dashboard.new_version_hint = Gitea %s is now available, you are running %s. Check the blog for more details. dashboard.statistic = Summary @@ -3180,6 +3182,18 @@ spamreports.created = Report Created spamreports.updated = Report Updated spamreports.status = Report Status +signed_contributor_agreements.all_option = All +signed_contributor_agreements.batch_sign = Batch sign contributor agreements +signed_contributor_agreements.batch_sign_button = Batch sign +signed_contributor_agreements.comment = Comment +signed_contributor_agreements.panel = Signed Contributor Agreements +signed_contributor_agreements.search_button = Search +signed_contributor_agreements.search_user = Search users +signed_contributor_agreements.signed_at = Signed At +signed_contributor_agreements.slug = CLA +signed_contributor_agreements.user = User +signed_contributor_agreements.usernames_input = Usernames, one per line + orgs.org_manage_panel = Organization Management orgs.name = Name orgs.teams = Teams @@ -3947,3 +3961,10 @@ normal_file = Normal file executable_file = Executable file symbolic_link = Symbolic link submodule = Submodule + +[contributor_agreements] +signed_at = Signed by you at %s +confirm = I agree to the terms of the contributor agreement. +sign = Sign +view_and_sign = View text and sign +view = View text diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index e5ffdc70ef5ea..d59d64a086c88 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -1025,6 +1025,8 @@ func Routes() *web.Router { }, reqSelfOrAdmin(), reqBasicOrRevProxyAuth()) m.Get("/activities/feeds", user.ListUserActivityFeeds) + // BLENDER: contributor agreement + m.Get("/contributor-agreements/{slug}", user.CheckContributorAgreement) }, context.UserAssignmentAPI(), checkTokenPublicOnly(), individualPermsChecker) }, tokenRequiresScopes(auth_model.AccessTokenScopeCategoryUser)) diff --git a/routers/api/v1/user/contributor_agreement.go b/routers/api/v1/user/contributor_agreement.go new file mode 100644 index 0000000000000..7744c66e18cd3 --- /dev/null +++ b/routers/api/v1/user/contributor_agreement.go @@ -0,0 +1,83 @@ +// Copyright 2025 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +// BLENDER: contributor agreement + +package user + +import ( + "fmt" + "net/http" + "strings" + + "code.gitea.io/gitea/models/db" + user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/httplib" + "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/services/context" + + "xorm.io/builder" +) + +func CheckContributorAgreement(ctx *context.APIContext) { + // swagger:operation GET /users/{username}/contributor-agreements/{slug} user userCheckContributorAgreement + // --- + // summary: Check if contributor agreement is signed by the user + // produces: + // - application/json + // parameters: + // - name: username + // in: path + // description: username of user + // type: string + // required: true + // - name: slug + // in: path + // description: slug of a contributor agreement to check + // type: string + // required: true + // responses: + // "200": + // "$ref": "#/responses/string" + // "404": + // "$ref": "#/responses/notFound" + + slug := ctx.PathParam("slug") + ca, exist, err := db.Get[user_model.ContributorAgreement](ctx, builder.Eq{"slug": slug}) + if err != nil { + ctx.APIErrorInternal(err) + return + } + if !exist { + ctx.APIError(http.StatusNotFound, fmt.Sprintf("Contributor agreement <%s> is not found.", slug)) + return + } + _, exist, err = db.Get[user_model.SignedContributorAgreement](ctx, builder.Eq{ + "contributor_agreement_id": ca.ID, + "user_id": ctx.ContextUser.ID, + }) + if err != nil { + ctx.APIErrorInternal(err) + return + } + if !exist { + url := httplib.MakeAbsoluteURL(ctx, setting.AppSubURL + "/user/settings/contributor_agreements") + message := []string{ + fmt.Sprintf("Contributor agreement <%s> is not signed.", slug), + fmt.Sprintf("Sign at %s", url), + } + // Add a visible *** decoration. + maxlen := 0 + for i := range message { + l := len(message[i]) + if l > maxlen { + maxlen = l + } + } + hr := strings.Repeat("*", maxlen) + message = append(append([]string{"", "", hr}, message...), hr, "") + ctx.PlainText(http.StatusNotFound, strings.Join(message, "\n")) + return + } + ctx.PlainText(http.StatusOK, "OK") +} diff --git a/routers/web/admin/signed_contributor_agreements.go b/routers/web/admin/signed_contributor_agreements.go new file mode 100644 index 0000000000000..732898b4d38c1 --- /dev/null +++ b/routers/web/admin/signed_contributor_agreements.go @@ -0,0 +1,202 @@ +// Copyright 2025 The Gitea Authors. +// SPDX-License-Identifier: MIT + +// BLENDER: contributor agreement + +package admin + +import ( + "fmt" + "net/http" + "strings" + + "code.gitea.io/gitea/models/db" + 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/templates" + "code.gitea.io/gitea/services/context" +) + +const ( + tplSignedContributorAgreements templates.TplName = "admin/signed_contributor_agreements/list" + tplContributorAgreementsBatchSign templates.TplName = "admin/signed_contributor_agreements/batch_sign" +) + +// SignedContributorAgreements shows signed contributor agreements. +func SignedContributorAgreements(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("admin.signed_contributor_agreements") + ctx.Data["PageIsSignedContributorAgreements"] = true + + page := ctx.FormInt("page") + if page <= 1 { + page = 1 + } + + opts := user_model.FindSignedContributorAgreementsOptions{ + ListOptions: db.ListOptions{ + PageSize: setting.UI.Admin.UserPagingNum, + Page: page, + }, + } + + contributorAgreementID := ctx.FormInt64("contributor_agreement_id") + ctx.Data["ContributorAgreementID"] = contributorAgreementID + if contributorAgreementID != 0 { + opts.ContributorAgreementID = contributorAgreementID + } + + keyword := ctx.FormTrim("q") + ctx.Data["Keyword"] = keyword + if keyword != "" { + users, _, err := user_model.SearchUsers(ctx, user_model.SearchUserOptions{Keyword: keyword, SearchByEmail: true}) + if err != nil { + ctx.ServerError("SearchUsers", err) + return + } + userIDs := make([]int64, 0, len(users)) + for _, user := range users { + userIDs = append(userIDs, user.ID) + } + opts.UserIDs = userIDs + } + + signedContributorAgreements, count, err := db.FindAndCount[user_model.SignedContributorAgreement](ctx, &opts) + if err != nil { + ctx.ServerError("SignedContributorAgreements", err) + return + } + ctx.Data["SignedContributorAgreements"] = signedContributorAgreements + pager := context.NewPagination(int(count), opts.PageSize, opts.Page, 5) + pager.AddParamFromRequest(ctx.Req) + ctx.Data["Page"] = pager + + contributorAgreements, err := db.Find[user_model.ContributorAgreement](ctx, &db.ListOptions{}) + if err != nil { + ctx.ServerError("FindContributorAgreements", err) + return + } + ctx.Data["ContributorAgreements"] = contributorAgreements + contributorAgreementsLookup := make(map[int64]string) + for _, ca := range contributorAgreements { + contributorAgreementsLookup[ca.ID] = ca.Slug + } + ctx.Data["ContributorAgreementsLookup"] = contributorAgreementsLookup + + userIDs := make([]int64, 0, len(signedContributorAgreements)) + for _, sca := range signedContributorAgreements { + userIDs = append(userIDs, sca.UserID) + } + userMap, err := user_model.GetUsersMapByIDs(ctx, userIDs) + if err != nil { + ctx.ServerError("GetUsersMapByIDs", err) + return + } + ctx.Data["UserMap"] = userMap + + ctx.HTML(http.StatusOK, tplSignedContributorAgreements) +} + +// ContributorAgreementsBatchSign displays a form for batch signing contributor agreements on users' behalf. +func ContributorAgreementsBatchSign(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("admin.signed_contributor_agreements.batch_sign") + ctx.Data["PageIsSignedContributorAgreements"] = true + + contributorAgreements, err := db.Find[user_model.ContributorAgreement](ctx, &db.ListOptions{}) + if err != nil { + ctx.ServerError("FindContributorAgreements", err) + return + } + ctx.Data["ContributorAgreements"] = contributorAgreements + + ctx.HTML(http.StatusOK, tplContributorAgreementsBatchSign) +} + +// ContributorAgreementsBatchSign processes a form for batch signing contributor agreements on users' behalf. +func ContributorAgreementsBatchSignPost(ctx *context.Context) { + comment := ctx.FormTrim("comment") + contributorAgreementID := ctx.FormInt64("contributor_agreement_id") + usernames := strings.Fields(ctx.FormTrim("usernames")) + + ctx.Data["Title"] = ctx.Tr("admin.signed_contributor_agreements.batch_sign") + ctx.Data["PageIsSignedContributorAgreements"] = true + + ctx.Data["Comment"] = comment + ctx.Data["ContributorAgreementID"] = contributorAgreementID + ctx.Data["Usernames"] = strings.Join(usernames, "\n") + + contributorAgreements, err := db.Find[user_model.ContributorAgreement](ctx, &db.ListOptions{}) + if err != nil { + ctx.ServerError("FindContributorAgreements", err) + return + } + ctx.Data["ContributorAgreements"] = contributorAgreements + + exists, err := db.ExistByID[user_model.ContributorAgreement](ctx, contributorAgreementID) + if err != nil { + ctx.ServerError("ExistByID", err) + return + } + if !exists { + ctx.Data["Error"] = fmt.Sprintf("unknown contributor agreement ID=%d", contributorAgreementID) + ctx.HTML(http.StatusOK, tplContributorAgreementsBatchSign) + return + } + + userIDs, err := user_model.GetUserIDsByNames(ctx, usernames, false) + if err != nil { + if user_model.IsErrUserNotExist(err) { + ctx.Data["Error"] = err + log.Error("GetUserIDsByNames: %v", err) + } else { + ctx.Data["Error"] = "something went wrong" + } + ctx.HTML(http.StatusOK, tplContributorAgreementsBatchSign) + return + } + // Check for duplicates before inserting. + existingSCA, err := db.Find[user_model.SignedContributorAgreement](ctx, &user_model.FindSignedContributorAgreementsOptions{ + ContributorAgreementID: contributorAgreementID, + UserIDs: userIDs, + }) + if err != nil { + ctx.ServerError("FindSignedContributorAgreements", err) + return + } + if len(existingSCA) > 0 { + existingUserIDs := make([]int64, len(existingSCA)) + for i, sca := range existingSCA { + existingUserIDs[i] = sca.UserID + } + existingUsers, err := user_model.GetUserByIDs(ctx, existingUserIDs) + if err != nil { + ctx.ServerError("GetUserByIDs", err) + return + } + existingUsernames := make([]string, len(existingUsers)) + for i, user := range existingUsers { + existingUsernames[i] = user.Name + } + ctx.Data["Error"] = fmt.Sprintf("users already signed this contributor agreement: %v", existingUsernames) + ctx.HTML(http.StatusOK, tplContributorAgreementsBatchSign) + return + } + + insertSCA := make([]*user_model.SignedContributorAgreement, len(userIDs)) + commentWithPrefix := fmt.Sprintf("batch signed: %s", comment) + for i, userID := range userIDs { + insertSCA[i] = &user_model.SignedContributorAgreement{ + ContributorAgreementID: contributorAgreementID, + Comment: commentWithPrefix, + UserID: userID, + } + } + if err := db.Insert(ctx, insertSCA); err != nil { + log.Error("Insert SignedContributorAgreements: %v", err) + ctx.Data["Error"] = "something went wrong" + ctx.HTML(http.StatusOK, tplContributorAgreementsBatchSign) + return + } + + ctx.Redirect(setting.AppSubURL + "/-/admin/signed_contributor_agreements") +} diff --git a/routers/web/user/setting/contributor_agreements.go b/routers/web/user/setting/contributor_agreements.go new file mode 100644 index 0000000000000..0513deb4a31f0 --- /dev/null +++ b/routers/web/user/setting/contributor_agreements.go @@ -0,0 +1,142 @@ +// Copyright 2025 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +// BLENDER: contributor agreement + +package setting + +import ( + "context" + "fmt" + "net/http" + + actions_model "code.gitea.io/gitea/models/actions" + "code.gitea.io/gitea/models/db" + 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/templates" + "code.gitea.io/gitea/modules/timeutil" + actions_service "code.gitea.io/gitea/services/actions" + gitea_context "code.gitea.io/gitea/services/context" + notify_service "code.gitea.io/gitea/services/notify" + + "xorm.io/builder" +) + +const ( + tplSettingsContributorAgreements templates.TplName = "user/settings/contributor_agreements" +) + +// ContributorAgreements lists all agreements and shows which ones were signed. +func ContributorAgreements(ctx *gitea_context.Context) { + contributorAgreements, err := db.Find[user_model.ContributorAgreement](ctx, &db.ListOptions{}) + if err != nil { + ctx.ServerError("FindContributorAgreements", err) + return + } + signedContributorAgreements, err := db.Find[user_model.SignedContributorAgreement](ctx, &user_model.FindSignedContributorAgreementsOptions{UserID: ctx.Doer.ID}) + if err != nil { + ctx.ServerError("FindSignedContributorAgreements", err) + return + } + signedID2Timestamp := make(map[int64]timeutil.TimeStamp) + for _, sca := range signedContributorAgreements { + signedID2Timestamp[sca.ContributorAgreementID] = sca.CreatedUnix + } + type UserContributorAgreement struct { + user_model.ContributorAgreement + SignedAt timeutil.TimeStamp + } + userContributorAgreements := make([]*UserContributorAgreement, len(contributorAgreements)) + for i, ca := range contributorAgreements { + var uca UserContributorAgreement + uca.ContributorAgreement = *ca + uca.SignedAt = signedID2Timestamp[ca.ID] + userContributorAgreements[i] = &uca + } + + ctx.Data["ContributorAgreements"] = userContributorAgreements + ctx.Data["PageIsSettingsContributorAgreements"] = true + ctx.Data["Title"] = ctx.Tr("settings.contributor_agreements") + ctx.HTML(http.StatusOK, tplSettingsContributorAgreements) +} + +// SignContributorAgreement signs a contributor agreement. +func SignContributorAgreement(ctx *gitea_context.Context) { + slug := ctx.PathParam("slug") + ca, exist, err := db.Get[user_model.ContributorAgreement](ctx, builder.Eq{"slug": slug}) + if err != nil { + ctx.ServerError("GetContributorAgreement", err) + return + } + if !exist { + ctx.PlainText(http.StatusNotFound, "unknown contributor agreement") + return + } + if err := db.Insert(ctx, &user_model.SignedContributorAgreement{UserID: ctx.Doer.ID, ContributorAgreementID: ca.ID}); err != nil { + ctx.ServerError("SignContributorAgreement", err) + return + } + // Check if there are any recent action run failures, trigger a re-run. + if err := rerunFailedActions(ctx, ctx.Doer); err != nil { + log.Error("rerunFailedActions for userID=%d failed: %v", ctx.Doer.ID, err) + } + ctx.Redirect(setting.AppSubURL + "/user/settings/contributor_agreements") +} + +// rerunFailedActions looks for recent cla.yml failures triggered by the user and reruns those. +func rerunFailedActions(ctx *gitea_context.Context, user *user_model.User) error { + runs, err := db.Find[actions_model.ActionRun](ctx, actions_model.FindRunOptions{ + ListOptions: db.ListOptions{PageSize: 10}, + Status: []actions_model.Status{actions_model.StatusFailure}, + TriggerUserID: user.ID, + WorkflowID: "cla.yml", + }) + if err != nil { + return fmt.Errorf("failed to find failed action runs: %w", err) + } + + // Core logic copied from Rerun func in routers/web/repo/actions/view.go + for _, run := range runs { + // reset run's start and stop time + run.PreviousDuration = run.Duration() + run.Started = 0 + run.Stopped = 0 + run.Status = actions_model.StatusWaiting + if err := actions_model.UpdateRun(ctx, run, "started", "stopped", "status", "previous_duration"); err != nil { + return fmt.Errorf("failed to UpdateRun: %w", err) + } + if err = run.LoadAttributes(ctx); err != nil { + return fmt.Errorf("LoadAttributes: %w", err) + } + notify_service.WorkflowRunStatusUpdate(ctx, run.Repo, run.TriggerUser, run) + + jobs, err := actions_model.GetRunJobsByRunID(ctx, run.ID) + if err != nil { + return fmt.Errorf("GetRunJobsByRunID: %w", err) + } + // We always expect exactly one job in cla.yml + if len(jobs) != 1 { + return fmt.Errorf("cla.yml has more than one job, run.ID=%d", run.ID) + } + + job := jobs[0] + status := job.Status + job.TaskID = 0 + job.Status = actions_model.StatusWaiting + job.Started = 0 + job.Stopped = 0 + if err := db.WithTx(ctx, func(ctx context.Context) error { + _, err := actions_model.UpdateRunJob(ctx, job, builder.Eq{"status": status}, "task_id", "status", "started", "stopped") + return err + }); err != nil { + return err + } + + actions_service.CreateCommitStatus(ctx, job) + notify_service.WorkflowJobStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job, nil) + } + + return nil +} diff --git a/routers/web/web.go b/routers/web/web.go index 292db3e9f776f..53eb37a7bb6b6 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -685,6 +685,9 @@ func registerWebRoutes(m *web.Router) { // BLENDER: spam reporting m.Post("/spamreport", user_setting.SpamReportUserPost) + // BLENDER: contributor agreement + m.Get("/contributor_agreements", user_setting.ContributorAgreements) + m.Post("/contributor_agreements/{slug}/sign", user_setting.SignContributorAgreement) }, reqSignIn, ctxDataSet("PageIsUserSettings", true, "EnablePackages", setting.Packages.Enabled, "EnableNotifyMail", setting.Service.EnableNotifyMail)) m.Group("/user", func() { @@ -765,6 +768,12 @@ func registerWebRoutes(m *web.Router) { }) m.Post("/purge_spammer", admin.PurgeSpammerPost) + // BLENDER: contributor agreement + m.Group("/signed_contributor_agreements", func() { + m.Get("", admin.SignedContributorAgreements) + m.Combo("/batch_sign").Get(admin.ContributorAgreementsBatchSign).Post(admin.ContributorAgreementsBatchSignPost) + }) + m.Group("/orgs", func() { m.Get("", admin.Organizations) }) diff --git a/services/user/delete.go b/services/user/delete.go index 39c6ef052dca7..f82009c919af6 100644 --- a/services/user/delete.go +++ b/services/user/delete.go @@ -95,6 +95,8 @@ func deleteUser(ctx context.Context, u *user_model.User, purge bool) (err error) &user_model.Blocking{BlockerID: u.ID}, &user_model.Blocking{BlockeeID: u.ID}, &actions_model.ActionRunnerToken{OwnerID: u.ID}, + // BLENDER: contributor agreement + &user_model.SignedContributorAgreement{UserID: u.ID}, ); err != nil { return fmt.Errorf("deleteBeans: %w", err) } diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index 6cee23f79cf8d..8f1ae3b0e412e 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -13,7 +13,7 @@ -
+
{{ctx.Locale.Tr "admin.identity_access"}}
@@ -31,6 +31,9 @@ {{ctx.Locale.Tr "admin.spamreports"}} + + {{ctx.Locale.Tr "admin.signed_contributor_agreements"}} +
diff --git a/templates/admin/signed_contributor_agreements/batch_sign.tmpl b/templates/admin/signed_contributor_agreements/batch_sign.tmpl new file mode 100644 index 0000000000000..6980bd93295c8 --- /dev/null +++ b/templates/admin/signed_contributor_agreements/batch_sign.tmpl @@ -0,0 +1,35 @@ +{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}} + +
+

+ {{ctx.Locale.Tr "admin.signed_contributor_agreements.batch_sign"}} +

+
+ {{if .Error}} +
{{.Error}}
+ {{end}} +
+ {{.CsrfTokenHtml}} + + + + +
+
+
+ +{{template "admin/layout_footer" .}} diff --git a/templates/admin/signed_contributor_agreements/list.tmpl b/templates/admin/signed_contributor_agreements/list.tmpl new file mode 100644 index 0000000000000..9c4db6809dbfd --- /dev/null +++ b/templates/admin/signed_contributor_agreements/list.tmpl @@ -0,0 +1,60 @@ +{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}} + +
+

+ {{ctx.Locale.Tr "admin.signed_contributor_agreements.panel"}} +
+ + {{ctx.Locale.Tr "admin.signed_contributor_agreements.batch_sign_button"}} + +
+

+
+
+ + + +
+
+
+ + + + + + + + + + + {{range .SignedContributorAgreements}} + + + + + + + {{end}} + +
{{ctx.Locale.Tr "admin.signed_contributor_agreements.user"}}{{ctx.Locale.Tr "admin.signed_contributor_agreements.signed_at"}}{{ctx.Locale.Tr "admin.signed_contributor_agreements.slug"}}{{ctx.Locale.Tr "admin.signed_contributor_agreements.comment"}}
+ + {{(index $.UserMap .UserID).Name}} + + ({{(index $.UserMap .UserID).Email}}) + {{DateUtils.AbsoluteShort .CreatedUnix}}{{index $.ContributorAgreementsLookup .ContributorAgreementID}}{{.Comment}}
+
+ {{template "base/paginate" .}} +
+ +{{template "admin/layout_footer" .}} diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl index ef0d607e3d9d3..92fe29bcdddb9 100644 --- a/templates/swagger/v1_json.tmpl +++ b/templates/swagger/v1_json.tmpl @@ -20199,6 +20199,42 @@ } } }, + "/users/{username}/contributor-agreements/{slug}": { + "get": { + "produces": [ + "application/json" + ], + "tags": [ + "user" + ], + "summary": "Check if contributor agreement is signed by the user", + "operationId": "userCheckContributorAgreement", + "parameters": [ + { + "type": "string", + "description": "username of user", + "name": "username", + "in": "path", + "required": true + }, + { + "type": "string", + "description": "slug of a contributor agreement to check", + "name": "slug", + "in": "path", + "required": true + } + ], + "responses": { + "200": { + "$ref": "#/responses/string" + }, + "404": { + "$ref": "#/responses/notFound" + } + } + } + }, "/users/{username}/followers": { "get": { "produces": [ diff --git a/templates/user/settings/contributor_agreements.tmpl b/templates/user/settings/contributor_agreements.tmpl new file mode 100644 index 0000000000000..3d621c2d1898a --- /dev/null +++ b/templates/user/settings/contributor_agreements.tmpl @@ -0,0 +1,45 @@ +{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings contributor-agreements")}} +
+

+ {{ctx.Locale.Tr "settings.contributor_agreements"}} +

+
+
+ {{range .ContributorAgreements}} +
+
+

{{.Slug}}

+ {{if .SignedAt}} +
{{ctx.Locale.Tr "contributor_agreements.signed_at" (DateUtils.FullTime .SignedAt)}}
+ {{end}} +
+
+ + {{if not .SignedAt}} + {{ctx.Locale.Tr "contributor_agreements.view_and_sign"}} + {{else}} + {{ctx.Locale.Tr "contributor_agreements.view"}} + {{end}} + + 
{{.Content}}
+ {{if not .SignedAt}} +
+ {{$.CsrfTokenHtml}} +
+
+ + +
+
+ +
+ {{end}} +
+
+ {{end}} +
+
+
+{{template "user/settings/layout_footer" .}} diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl index 34e089a68a9e6..eba9f16888705 100644 --- a/templates/user/settings/navbar.tmpl +++ b/templates/user/settings/navbar.tmpl @@ -65,5 +65,8 @@ {{ctx.Locale.Tr "settings.repos"}} + + {{ctx.Locale.Tr "settings.contributor_agreements"}} +