mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-06 00:43:06 +01:00
63a401ac40
This PR moves the secrets and runners settings to actions settings on
all settings(repo,org,user,admin) levels.
After this PR, if
[ENABLED](5e7543fcf4/custom/conf/app.example.ini (L2604)
)
inside `app.ini` under `[actions]` is set to `false`, the "Actions" tab
(including runners management and secrets management) will not be shown.
After, the settings under actions settings for each level:
1. Admin Level
"Runners Management"
<img width="1437" alt="Screen Shot 2023-04-26 at 14 34 20"
src="https://user-images.githubusercontent.com/17645053/234489731-15822d21-38e1-4560-8bbe-69f122376abc.png">
2. User Level
"Secrets Management"
<img width="1427" alt="Screen Shot 2023-04-26 at 14 34 30"
src="https://user-images.githubusercontent.com/17645053/234489795-68c9c0cb-24f8-4f09-95c6-458ab914c313.png">
3. Repo and Organization Levels
"Runners Management" and "Secrets Management"
Org:
<img width="1437" alt="Screen Shot 2023-04-26 at 14 35 07"
src="https://user-images.githubusercontent.com/17645053/234489996-f3af5ebb-d354-46ca-9087-a0b586845281.png">
<img width="1433" alt="Screen Shot 2023-04-26 at 14 35 14"
src="https://user-images.githubusercontent.com/17645053/234490004-3abf8fed-81fd-4ce2-837a-935dade1793d.png">
Repo:
<img width="1419" alt="Screen Shot 2023-04-26 at 14 34 50"
src="https://user-images.githubusercontent.com/17645053/234489904-80c11038-4b58-462c-9d0b-8b7cf70bc2b3.png">
<img width="1430" alt="Screen Shot 2023-04-26 at 14 34 57"
src="https://user-images.githubusercontent.com/17645053/234489918-4e8d1fe2-9bcd-4d8a-96c1-238a8088d92e.png">
It also finished these tasks :
- [x] rename routers function "runners" to "actions", and refactor
related file names
- [x] check and modify part of the runners related functions to match
their name
- [x] Fix backend check caused by fmt check
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
152 lines
4.1 KiB
Go
152 lines
4.1 KiB
Go
// Copyright 2020 The Gitea Authors.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package admin
|
|
|
|
import (
|
|
"bytes"
|
|
"net/http"
|
|
"net/url"
|
|
|
|
"code.gitea.io/gitea/models/db"
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
"code.gitea.io/gitea/modules/base"
|
|
"code.gitea.io/gitea/modules/context"
|
|
"code.gitea.io/gitea/modules/log"
|
|
"code.gitea.io/gitea/modules/setting"
|
|
"code.gitea.io/gitea/modules/util"
|
|
)
|
|
|
|
const (
|
|
tplEmails base.TplName = "admin/emails/list"
|
|
)
|
|
|
|
// Emails show all emails
|
|
func Emails(ctx *context.Context) {
|
|
ctx.Data["Title"] = ctx.Tr("admin.emails")
|
|
ctx.Data["PageIsAdminEmails"] = true
|
|
|
|
opts := &user_model.SearchEmailOptions{
|
|
ListOptions: db.ListOptions{
|
|
PageSize: setting.UI.Admin.UserPagingNum,
|
|
Page: ctx.FormInt("page"),
|
|
},
|
|
}
|
|
|
|
if opts.Page <= 1 {
|
|
opts.Page = 1
|
|
}
|
|
|
|
type ActiveEmail struct {
|
|
user_model.SearchEmailResult
|
|
CanChange bool
|
|
}
|
|
|
|
var (
|
|
baseEmails []*user_model.SearchEmailResult
|
|
emails []ActiveEmail
|
|
count int64
|
|
err error
|
|
orderBy user_model.SearchEmailOrderBy
|
|
)
|
|
|
|
ctx.Data["SortType"] = ctx.FormString("sort")
|
|
switch ctx.FormString("sort") {
|
|
case "email":
|
|
orderBy = user_model.SearchEmailOrderByEmail
|
|
case "reverseemail":
|
|
orderBy = user_model.SearchEmailOrderByEmailReverse
|
|
case "username":
|
|
orderBy = user_model.SearchEmailOrderByName
|
|
case "reverseusername":
|
|
orderBy = user_model.SearchEmailOrderByNameReverse
|
|
default:
|
|
ctx.Data["SortType"] = "email"
|
|
orderBy = user_model.SearchEmailOrderByEmail
|
|
}
|
|
|
|
opts.Keyword = ctx.FormTrim("q")
|
|
opts.SortType = orderBy
|
|
if len(ctx.FormString("is_activated")) != 0 {
|
|
opts.IsActivated = util.OptionalBoolOf(ctx.FormBool("activated"))
|
|
}
|
|
if len(ctx.FormString("is_primary")) != 0 {
|
|
opts.IsPrimary = util.OptionalBoolOf(ctx.FormBool("primary"))
|
|
}
|
|
|
|
if len(opts.Keyword) == 0 || isKeywordValid(opts.Keyword) {
|
|
baseEmails, count, err = user_model.SearchEmails(opts)
|
|
if err != nil {
|
|
ctx.ServerError("SearchEmails", err)
|
|
return
|
|
}
|
|
emails = make([]ActiveEmail, len(baseEmails))
|
|
for i := range baseEmails {
|
|
emails[i].SearchEmailResult = *baseEmails[i]
|
|
// Don't let the admin deactivate its own primary email address
|
|
// We already know the user is admin
|
|
emails[i].CanChange = ctx.Doer.ID != emails[i].UID || !emails[i].IsPrimary
|
|
}
|
|
}
|
|
ctx.Data["Keyword"] = opts.Keyword
|
|
ctx.Data["Total"] = count
|
|
ctx.Data["Emails"] = emails
|
|
|
|
pager := context.NewPagination(int(count), opts.PageSize, opts.Page, 5)
|
|
pager.SetDefaultParams(ctx)
|
|
ctx.Data["Page"] = pager
|
|
|
|
ctx.HTML(http.StatusOK, tplEmails)
|
|
}
|
|
|
|
var nullByte = []byte{0x00}
|
|
|
|
func isKeywordValid(keyword string) bool {
|
|
return !bytes.Contains([]byte(keyword), nullByte)
|
|
}
|
|
|
|
// ActivateEmail serves a POST request for activating/deactivating a user's email
|
|
func ActivateEmail(ctx *context.Context) {
|
|
truefalse := map[string]bool{"1": true, "0": false}
|
|
|
|
uid := ctx.FormInt64("uid")
|
|
email := ctx.FormString("email")
|
|
primary, okp := truefalse[ctx.FormString("primary")]
|
|
activate, oka := truefalse[ctx.FormString("activate")]
|
|
|
|
if uid == 0 || len(email) == 0 || !okp || !oka {
|
|
ctx.Error(http.StatusBadRequest)
|
|
return
|
|
}
|
|
|
|
log.Info("Changing activation for User ID: %d, email: %s, primary: %v to %v", uid, email, primary, activate)
|
|
|
|
if err := user_model.ActivateUserEmail(uid, email, activate); err != nil {
|
|
log.Error("ActivateUserEmail(%v,%v,%v): %v", uid, email, activate, err)
|
|
if user_model.IsErrEmailAlreadyUsed(err) {
|
|
ctx.Flash.Error(ctx.Tr("admin.emails.duplicate_active"))
|
|
} else {
|
|
ctx.Flash.Error(ctx.Tr("admin.emails.not_updated", err))
|
|
}
|
|
} else {
|
|
log.Info("Activation for User ID: %d, email: %s, primary: %v changed to %v", uid, email, primary, activate)
|
|
ctx.Flash.Info(ctx.Tr("admin.emails.updated"))
|
|
}
|
|
|
|
redirect, _ := url.Parse(setting.AppSubURL + "/admin/emails")
|
|
q := url.Values{}
|
|
if val := ctx.FormTrim("q"); len(val) > 0 {
|
|
q.Set("q", val)
|
|
}
|
|
if val := ctx.FormTrim("sort"); len(val) > 0 {
|
|
q.Set("sort", val)
|
|
}
|
|
if val := ctx.FormTrim("is_primary"); len(val) > 0 {
|
|
q.Set("is_primary", val)
|
|
}
|
|
if val := ctx.FormTrim("is_activated"); len(val) > 0 {
|
|
q.Set("is_activated", val)
|
|
}
|
|
redirect.RawQuery = q.Encode()
|
|
ctx.Redirect(redirect.String())
|
|
}
|