mirror of
https://github.com/go-gitea/gitea.git
synced 2025-04-08 17:05:45 +02:00
add runners management ui
This commit is contained in:
parent
2ea693cdd2
commit
931d8c2c21
@ -8,6 +8,8 @@ import (
|
||||
"fmt"
|
||||
|
||||
"code.gitea.io/gitea/models/db"
|
||||
repo_model "code.gitea.io/gitea/models/repo"
|
||||
user_model "code.gitea.io/gitea/models/user"
|
||||
"code.gitea.io/gitea/modules/timeutil"
|
||||
|
||||
"xorm.io/builder"
|
||||
@ -25,16 +27,18 @@ func (err ErrRunnerNotExist) Error() string {
|
||||
// Runner represents runner machines
|
||||
type Runner struct {
|
||||
ID int64
|
||||
UUID string `xorm:"CHAR(36) UNIQUE"`
|
||||
Name string `xorm:"VARCHAR(32) UNIQUE"`
|
||||
OS string `xorm:"VARCHAR(16) index"` // the runner running os
|
||||
Arch string `xorm:"VARCHAR(16) index"` // the runner running architecture
|
||||
Type string `xorm:"VARCHAR(16)"`
|
||||
OwnerID int64 `xorm:"index"` // org level runner, 0 means system
|
||||
RepoID int64 `xorm:"index"` // repo level runner, if orgid also is zero, then it's a global
|
||||
Description string `xorm:"TEXT"`
|
||||
Base int // 0 native 1 docker 2 virtual machine
|
||||
RepoRange string // glob match which repositories could use this runner
|
||||
UUID string `xorm:"CHAR(36) UNIQUE"`
|
||||
Name string `xorm:"VARCHAR(32) UNIQUE"`
|
||||
OS string `xorm:"VARCHAR(16) index"` // the runner running os
|
||||
Arch string `xorm:"VARCHAR(16) index"` // the runner running architecture
|
||||
Type string `xorm:"VARCHAR(16)"`
|
||||
OwnerID int64 `xorm:"index"` // org level runner, 0 means system
|
||||
Owner *user_model.User `xorm:"-"`
|
||||
RepoID int64 `xorm:"index"` // repo level runner, if orgid also is zero, then it's a global
|
||||
Repo *repo_model.Repository `xorm:"-"`
|
||||
Description string `xorm:"TEXT"`
|
||||
Base int // 0 native 1 docker 2 virtual machine
|
||||
RepoRange string // glob match which repositories could use this runner
|
||||
Token string
|
||||
LastOnline timeutil.TimeStamp `xorm:"index"`
|
||||
Created timeutil.TimeStamp `xorm:"created"`
|
||||
@ -44,16 +48,28 @@ func (Runner) TableName() string {
|
||||
return "bots_runner"
|
||||
}
|
||||
|
||||
func (r *Runner) OwnType() string {
|
||||
if r.OwnerID == 0 {
|
||||
return "Global Type"
|
||||
}
|
||||
if r.RepoID == 0 {
|
||||
return r.Owner.Name
|
||||
}
|
||||
|
||||
return r.Repo.FullName()
|
||||
}
|
||||
|
||||
func init() {
|
||||
db.RegisterModel(&Runner{})
|
||||
}
|
||||
|
||||
type GetRunnerOptions struct {
|
||||
type FindRunnerOptions struct {
|
||||
db.ListOptions
|
||||
RepoID int64
|
||||
OwnerID int64
|
||||
}
|
||||
|
||||
func (opts GetRunnerOptions) toCond() builder.Cond {
|
||||
func (opts FindRunnerOptions) toCond() builder.Cond {
|
||||
cond := builder.NewCond()
|
||||
if opts.RepoID > 0 {
|
||||
cond = cond.And(builder.Eq{"repo_id": opts.RepoID})
|
||||
@ -65,8 +81,24 @@ func (opts GetRunnerOptions) toCond() builder.Cond {
|
||||
return cond
|
||||
}
|
||||
|
||||
func CountRunners(opts FindRunnerOptions) (int64, error) {
|
||||
return db.GetEngine(db.DefaultContext).
|
||||
Table("bots_runner").
|
||||
Where(opts.toCond()).
|
||||
Count()
|
||||
}
|
||||
|
||||
func FindRunners(opts FindRunnerOptions) (runners RunnerList, err error) {
|
||||
sess := db.GetEngine(db.DefaultContext).
|
||||
Where(opts.toCond())
|
||||
if opts.Page > 0 {
|
||||
sess.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize)
|
||||
}
|
||||
return runners, sess.Find(&runners)
|
||||
}
|
||||
|
||||
// GetUsableRunner returns the usable runner
|
||||
func GetUsableRunner(opts GetRunnerOptions) (*Runner, error) {
|
||||
func GetUsableRunner(opts FindRunnerOptions) (*Runner, error) {
|
||||
var runner Runner
|
||||
has, err := db.GetEngine(db.DefaultContext).
|
||||
Where(opts.toCond()).
|
||||
|
84
models/bots/runner_list.go
Normal file
84
models/bots/runner_list.go
Normal file
@ -0,0 +1,84 @@
|
||||
// Copyright 2022 The Gitea Authors. All rights reserved.
|
||||
// Use of this source code is governed by a MIT-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package bots
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"code.gitea.io/gitea/models/db"
|
||||
repo_model "code.gitea.io/gitea/models/repo"
|
||||
user_model "code.gitea.io/gitea/models/user"
|
||||
"code.gitea.io/gitea/modules/container"
|
||||
)
|
||||
|
||||
type RunnerList []*Runner
|
||||
|
||||
// GetUserIDs returns a slice of user's id
|
||||
func (runners RunnerList) GetUserIDs() []int64 {
|
||||
userIDsMap := make(map[int64]struct{})
|
||||
for _, runner := range runners {
|
||||
if runner.OwnerID == 0 {
|
||||
continue
|
||||
}
|
||||
userIDsMap[runner.OwnerID] = struct{}{}
|
||||
}
|
||||
userIDs := make([]int64, 0, len(userIDsMap))
|
||||
for userID := range userIDsMap {
|
||||
userIDs = append(userIDs, userID)
|
||||
}
|
||||
return userIDs
|
||||
}
|
||||
|
||||
func (runners RunnerList) LoadOwners(ctx context.Context) error {
|
||||
userIDs := runners.GetUserIDs()
|
||||
users := make(map[int64]*user_model.User, len(userIDs))
|
||||
if err := db.GetEngine(ctx).In("id", userIDs).Find(&users); err != nil {
|
||||
return err
|
||||
}
|
||||
for _, runner := range runners {
|
||||
if runner.OwnerID > 0 && runner.Owner == nil {
|
||||
runner.Owner = users[runner.OwnerID]
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (runners RunnerList) getRepoIDs() []int64 {
|
||||
repoIDs := make(map[int64]struct{}, len(runners))
|
||||
for _, runner := range runners {
|
||||
if runner.RepoID == 0 {
|
||||
continue
|
||||
}
|
||||
if _, ok := repoIDs[runner.RepoID]; !ok {
|
||||
repoIDs[runner.RepoID] = struct{}{}
|
||||
}
|
||||
}
|
||||
return container.KeysInt64(repoIDs)
|
||||
}
|
||||
|
||||
func (runners RunnerList) LoadRepos(ctx context.Context) error {
|
||||
repoIDs := runners.getRepoIDs()
|
||||
repos := make(map[int64]*repo_model.Repository, len(repoIDs))
|
||||
if err := db.GetEngine(ctx).In("id", repoIDs).Find(&repos); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for _, runner := range runners {
|
||||
if runner.RepoID > 0 && runner.Repo == nil {
|
||||
runner.Repo = repos[runner.RepoID]
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (runners RunnerList) LoadAttributes(ctx context.Context) error {
|
||||
if err := runners.LoadOwners(ctx); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := runners.LoadRepos(ctx); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
@ -14,6 +14,7 @@ import (
|
||||
|
||||
bots_model "code.gitea.io/gitea/models/bots"
|
||||
"code.gitea.io/gitea/modules/log"
|
||||
"code.gitea.io/gitea/modules/timeutil"
|
||||
"code.gitea.io/gitea/modules/web"
|
||||
|
||||
"github.com/gorilla/websocket"
|
||||
@ -40,10 +41,113 @@ type Message struct {
|
||||
Version int //
|
||||
Type int // message type, 1 register 2 error 3 task 4 no task
|
||||
RunnerUUID string // runner uuid
|
||||
BuildUUID string // build uuid
|
||||
ErrCode int // error code
|
||||
ErrContent string // errors message
|
||||
EventName string
|
||||
EventPayload string
|
||||
JobID string // only run the special job, empty means run all the jobs
|
||||
}
|
||||
|
||||
const (
|
||||
version1 = 1
|
||||
)
|
||||
|
||||
const (
|
||||
MsgTypeRegister = iota + 1 // register
|
||||
MsgTypeError // error
|
||||
MsgTypeRequestBuild // request build task
|
||||
MsgTypeIdle // no task
|
||||
MsgTypeBuildResult // build result
|
||||
MsgTypeBuildJobResult // build job result
|
||||
)
|
||||
|
||||
func handleVersion1(r *http.Request, c *websocket.Conn, mt int, message []byte, msg *Message) error {
|
||||
switch msg.Type {
|
||||
case MsgTypeRegister:
|
||||
log.Info("websocket[%s] registered", r.RemoteAddr)
|
||||
runner, err := bots_model.GetRunnerByUUID(msg.RunnerUUID)
|
||||
if err != nil {
|
||||
if !errors.Is(err, bots_model.ErrRunnerNotExist{}) {
|
||||
return fmt.Errorf("websocket[%s] get runner [%s] failed: %v", r.RemoteAddr, msg.RunnerUUID, err)
|
||||
}
|
||||
err = c.WriteMessage(mt, message)
|
||||
if err != nil {
|
||||
return fmt.Errorf("websocket[%s] sent message failed: %v", r.RemoteAddr, err)
|
||||
}
|
||||
} else {
|
||||
fmt.Printf("-----%v\n", runner)
|
||||
// TODO: handle read message
|
||||
err = c.WriteMessage(mt, message)
|
||||
if err != nil {
|
||||
return fmt.Errorf("websocket[%s] sent message failed: %v", r.RemoteAddr, err)
|
||||
}
|
||||
}
|
||||
case MsgTypeRequestBuild:
|
||||
// TODO: find new task and send to client
|
||||
build, err := bots_model.GetCurBuildByUUID(msg.RunnerUUID)
|
||||
if err != nil {
|
||||
return fmt.Errorf("websocket[%s] get task[%s] failed: %v", r.RemoteAddr, msg.RunnerUUID, err)
|
||||
}
|
||||
var returnMsg *Message
|
||||
if build == nil {
|
||||
time.Sleep(3 * time.Second)
|
||||
returnMsg = &Message{
|
||||
Version: version1,
|
||||
Type: MsgTypeIdle,
|
||||
RunnerUUID: msg.RunnerUUID,
|
||||
}
|
||||
} else {
|
||||
returnMsg = &Message{
|
||||
Version: version1,
|
||||
Type: MsgTypeRequestBuild,
|
||||
RunnerUUID: msg.RunnerUUID,
|
||||
BuildUUID: build.UUID,
|
||||
EventName: build.Event.Event(),
|
||||
EventPayload: build.EventPayload,
|
||||
}
|
||||
}
|
||||
bs, err := json.Marshal(&returnMsg)
|
||||
if err != nil {
|
||||
return fmt.Errorf("websocket[%s] marshal message failed: %v", r.RemoteAddr, err)
|
||||
}
|
||||
err = c.WriteMessage(mt, bs)
|
||||
if err != nil {
|
||||
return fmt.Errorf("websocket[%s] sent message failed: %v", r.RemoteAddr, err)
|
||||
}
|
||||
case MsgTypeBuildResult:
|
||||
log.Info("websocket[%s] returned CI result: %v", r.RemoteAddr, msg)
|
||||
build, err := bots_model.GetBuildByUUID(msg.BuildUUID)
|
||||
if err != nil {
|
||||
return fmt.Errorf("websocket[%s] get build by uuid failed: %v", r.RemoteAddr, err)
|
||||
}
|
||||
cols := []string{"status", "end_time"}
|
||||
if msg.ErrCode == 0 {
|
||||
build.Status = bots_model.BuildFinished
|
||||
} else {
|
||||
build.Status = bots_model.BuildFailed
|
||||
}
|
||||
build.EndTime = timeutil.TimeStampNow()
|
||||
if err := bots_model.UpdateBuild(build, cols...); err != nil {
|
||||
log.Error("websocket[%s] update build failed: %v", r.RemoteAddr, err)
|
||||
}
|
||||
default:
|
||||
returnMsg := Message{
|
||||
Version: version1,
|
||||
Type: MsgTypeError,
|
||||
ErrCode: 1,
|
||||
ErrContent: fmt.Sprintf("message type %d is not supported", msg.Type),
|
||||
}
|
||||
bs, err := json.Marshal(&returnMsg)
|
||||
if err != nil {
|
||||
return fmt.Errorf("websocket[%s] marshal message failed: %v", r.RemoteAddr, err)
|
||||
}
|
||||
err = c.WriteMessage(mt, bs)
|
||||
if err != nil {
|
||||
return fmt.Errorf("websocket[%s] sent message failed: %v", r.RemoteAddr, err)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func Serve(w http.ResponseWriter, r *http.Request) {
|
||||
@ -59,24 +163,21 @@ func Serve(w http.ResponseWriter, r *http.Request) {
|
||||
c.SetReadDeadline(time.Now().Add(pongWait))
|
||||
c.SetPongHandler(func(string) error { c.SetReadDeadline(time.Now().Add(pongWait)); return nil })
|
||||
|
||||
MESSAGE_BUMP:
|
||||
for {
|
||||
// read log from client
|
||||
// read message from client
|
||||
mt, message, err := c.ReadMessage()
|
||||
if err != nil {
|
||||
if websocket.IsCloseError(err, websocket.CloseAbnormalClosure) ||
|
||||
websocket.IsCloseError(err, websocket.CloseNormalClosure) {
|
||||
c.Close()
|
||||
break
|
||||
}
|
||||
if !strings.Contains(err.Error(), "i/o timeout") {
|
||||
} else if !strings.Contains(err.Error(), "i/o timeout") {
|
||||
log.Error("websocket[%s] read failed: %#v", r.RemoteAddr, err)
|
||||
}
|
||||
break
|
||||
} else {
|
||||
log.Trace("websocket[%s] received message: %s", r.RemoteAddr, message)
|
||||
}
|
||||
|
||||
log.Trace("websocket[%s] received message: %s", r.RemoteAddr, string(message))
|
||||
|
||||
// read message first
|
||||
var msg Message
|
||||
if err = json.Unmarshal(message, &msg); err != nil {
|
||||
@ -86,103 +187,25 @@ MESSAGE_BUMP:
|
||||
|
||||
switch msg.Version {
|
||||
case 1:
|
||||
switch msg.Type {
|
||||
case 1:
|
||||
log.Info("websocket[%s] registered", r.RemoteAddr)
|
||||
runner, err := bots_model.GetRunnerByUUID(msg.RunnerUUID)
|
||||
if err != nil {
|
||||
if !errors.Is(err, bots_model.ErrRunnerNotExist{}) {
|
||||
log.Error("websocket[%s] get runner [%s] failed: %v", r.RemoteAddr, msg.RunnerUUID, err)
|
||||
break
|
||||
}
|
||||
err = c.WriteMessage(mt, message)
|
||||
if err != nil {
|
||||
log.Error("websocket[%s] sent message failed: %v", r.RemoteAddr, err)
|
||||
break
|
||||
}
|
||||
} else {
|
||||
fmt.Printf("-----%v\n", runner)
|
||||
// TODO: handle read message
|
||||
err = c.WriteMessage(mt, message)
|
||||
if err != nil {
|
||||
log.Error("websocket[%s] sent message failed: %v", r.RemoteAddr, err)
|
||||
break
|
||||
}
|
||||
}
|
||||
default:
|
||||
returnMsg := Message{
|
||||
Version: 1,
|
||||
Type: 2,
|
||||
ErrCode: 1,
|
||||
ErrContent: fmt.Sprintf("message type %d is not supported", msg.Type),
|
||||
}
|
||||
bs, err := json.Marshal(&returnMsg)
|
||||
if err != nil {
|
||||
log.Error("websocket[%s] marshal message failed: %v", r.RemoteAddr, err)
|
||||
break MESSAGE_BUMP
|
||||
}
|
||||
err = c.WriteMessage(mt, bs)
|
||||
if err != nil {
|
||||
log.Error("websocket[%s] sent message failed: %v", r.RemoteAddr, err)
|
||||
}
|
||||
break MESSAGE_BUMP
|
||||
if err := handleVersion1(r, c, mt, message, &msg); err != nil {
|
||||
log.Error("%v", err)
|
||||
}
|
||||
default:
|
||||
returnMsg := Message{
|
||||
Version: 1,
|
||||
Type: 2,
|
||||
Type: MsgTypeError,
|
||||
ErrCode: 1,
|
||||
ErrContent: "version is not supported",
|
||||
}
|
||||
bs, err := json.Marshal(&returnMsg)
|
||||
if err != nil {
|
||||
log.Error("websocket[%s] marshal message failed: %v", r.RemoteAddr, err)
|
||||
break MESSAGE_BUMP
|
||||
}
|
||||
err = c.WriteMessage(mt, bs)
|
||||
if err != nil {
|
||||
log.Error("websocket[%s] sent message failed: %v", r.RemoteAddr, err)
|
||||
}
|
||||
break MESSAGE_BUMP
|
||||
}
|
||||
|
||||
// TODO: find new task and send to client
|
||||
task, err := bots_model.GetCurBuildByUUID(msg.RunnerUUID)
|
||||
if err != nil {
|
||||
log.Error("websocket[%s] get task failed: %v", r.RemoteAddr, err)
|
||||
break
|
||||
}
|
||||
if task == nil {
|
||||
returnMsg := Message{
|
||||
Version: 1,
|
||||
Type: 4,
|
||||
}
|
||||
bs, err := json.Marshal(&returnMsg)
|
||||
if err != nil {
|
||||
log.Error("websocket[%s] marshal message failed: %v", r.RemoteAddr, err)
|
||||
break MESSAGE_BUMP
|
||||
}
|
||||
err = c.WriteMessage(mt, bs)
|
||||
if err != nil {
|
||||
log.Error("websocket[%s] sent message failed: %v", r.RemoteAddr, err)
|
||||
}
|
||||
} else {
|
||||
returnMsg := Message{
|
||||
Version: 1,
|
||||
Type: 3,
|
||||
EventName: task.Event.Event(),
|
||||
EventPayload: task.EventPayload,
|
||||
}
|
||||
bs, err := json.Marshal(&returnMsg)
|
||||
if err != nil {
|
||||
log.Error("websocket[%s] marshal message failed: %v", r.RemoteAddr, err)
|
||||
break
|
||||
}
|
||||
err = c.WriteMessage(mt, bs)
|
||||
if err != nil {
|
||||
log.Error("websocket[%s] sent message failed: %v", r.RemoteAddr, err)
|
||||
} else {
|
||||
err = c.WriteMessage(mt, bs)
|
||||
if err != nil {
|
||||
log.Error("websocket[%s] sent message failed: %v", r.RemoteAddr, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
129
routers/web/admin/runners.go
Normal file
129
routers/web/admin/runners.go
Normal file
@ -0,0 +1,129 @@
|
||||
// Copyright 2014 The Gogs Authors. All rights reserved.
|
||||
// Copyright 2020 The Gitea Authors.
|
||||
// Use of this source code is governed by a MIT-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package admin
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"net/url"
|
||||
|
||||
bots_model "code.gitea.io/gitea/models/bots"
|
||||
"code.gitea.io/gitea/models/db"
|
||||
"code.gitea.io/gitea/modules/base"
|
||||
"code.gitea.io/gitea/modules/context"
|
||||
"code.gitea.io/gitea/modules/setting"
|
||||
)
|
||||
|
||||
const (
|
||||
tplRunners base.TplName = "admin/runner/list"
|
||||
tplRunnerNew base.TplName = "admin/runner/new"
|
||||
tplRunnerEdit base.TplName = "admin/runner/edit"
|
||||
)
|
||||
|
||||
// Runners show all the runners
|
||||
func Runners(ctx *context.Context) {
|
||||
ctx.Data["Title"] = ctx.Tr("admin.runners")
|
||||
ctx.Data["PageIsAdmin"] = true
|
||||
ctx.Data["PageIsAdminRunners"] = true
|
||||
|
||||
page := ctx.FormInt("page")
|
||||
if page <= 1 {
|
||||
page = 1
|
||||
}
|
||||
|
||||
opts := bots_model.FindRunnerOptions{
|
||||
ListOptions: db.ListOptions{
|
||||
Page: page,
|
||||
PageSize: 100,
|
||||
},
|
||||
}
|
||||
|
||||
count, err := bots_model.CountRunners(opts)
|
||||
if err != nil {
|
||||
ctx.ServerError("SearchUsers", err)
|
||||
return
|
||||
}
|
||||
|
||||
runners, err := bots_model.FindRunners(opts)
|
||||
if err != nil {
|
||||
ctx.ServerError("SearchUsers", err)
|
||||
return
|
||||
}
|
||||
if err := runners.LoadAttributes(ctx); err != nil {
|
||||
ctx.ServerError("LoadAttributes", err)
|
||||
return
|
||||
}
|
||||
|
||||
ctx.Data["Runners"] = runners
|
||||
ctx.Data["Total"] = count
|
||||
|
||||
pager := context.NewPagination(int(count), opts.PageSize, opts.Page, 5)
|
||||
ctx.Data["Page"] = pager
|
||||
|
||||
ctx.HTML(http.StatusOK, tplRunners)
|
||||
}
|
||||
|
||||
// NewRunner render adding a new runner page
|
||||
func NewRunner(ctx *context.Context) {
|
||||
ctx.Data["Title"] = ctx.Tr("admin.runners.new")
|
||||
ctx.Data["PageIsAdmin"] = true
|
||||
ctx.Data["PageIsAdminRunners"] = true
|
||||
|
||||
ctx.HTML(http.StatusOK, tplRunnerNew)
|
||||
}
|
||||
|
||||
// NewRunnerPost response for adding a new runner
|
||||
func NewRunnerPost(ctx *context.Context) {
|
||||
// form := web.GetForm(ctx).(*forms.AdminCreateRunnerForm)
|
||||
ctx.Data["Title"] = ctx.Tr("admin.runners.new")
|
||||
ctx.Data["PageIsAdmin"] = true
|
||||
ctx.Data["PageIsAdminRunners"] = true
|
||||
|
||||
if ctx.HasError() {
|
||||
ctx.HTML(http.StatusOK, tplRunnerNew)
|
||||
return
|
||||
}
|
||||
|
||||
// ctx.Flash.Success(ctx.Tr("admin.runners.new_success", u.Name))
|
||||
// ctx.Redirect(setting.AppSubURL + "/admin/users/" + strconv.FormatInt(u.ID, 10))
|
||||
}
|
||||
|
||||
// EditRunner show editing runner page
|
||||
func EditRunner(ctx *context.Context) {
|
||||
ctx.Data["Title"] = ctx.Tr("admin.runners.edit")
|
||||
ctx.Data["PageIsAdmin"] = true
|
||||
ctx.Data["PageIsAdminRunners"] = true
|
||||
|
||||
prepareUserInfo(ctx)
|
||||
if ctx.Written() {
|
||||
return
|
||||
}
|
||||
|
||||
ctx.HTML(http.StatusOK, tplUserEdit)
|
||||
}
|
||||
|
||||
// EditRunnerPost response for editing runner
|
||||
func EditRunnerPost(ctx *context.Context) {
|
||||
// form := web.GetForm(ctx).(*forms.AdminEditRunnerForm)
|
||||
ctx.Data["Title"] = ctx.Tr("admin.runners.edit")
|
||||
ctx.Data["PageIsAdmin"] = true
|
||||
ctx.Data["PageIsAdminRunners"] = true
|
||||
|
||||
if ctx.HasError() {
|
||||
ctx.HTML(http.StatusOK, tplUserEdit)
|
||||
return
|
||||
}
|
||||
|
||||
ctx.Flash.Success(ctx.Tr("admin.users.update_profile_success"))
|
||||
ctx.Redirect(setting.AppSubURL + "/admin/users/" + url.PathEscape(ctx.Params(":userid")))
|
||||
}
|
||||
|
||||
// DeleteRunner response for deleting a runner
|
||||
func DeleteRunner(ctx *context.Context) {
|
||||
ctx.Flash.Success(ctx.Tr("admin.runners.deletion_success"))
|
||||
ctx.JSON(http.StatusOK, map[string]interface{}{
|
||||
"redirect": setting.AppSubURL + "/admin/runners",
|
||||
})
|
||||
}
|
@ -624,6 +624,13 @@ func RegisterRoutes(m *web.Route) {
|
||||
return
|
||||
}
|
||||
})
|
||||
|
||||
m.Group("/runners", func() {
|
||||
m.Get("", admin.Runners)
|
||||
m.Combo("/new").Get(admin.NewRunner).Post(bindIgnErr(forms.AdminCreateRunnerForm{}), admin.NewRunnerPost)
|
||||
m.Combo("/{runnerid}").Get(admin.EditRunner).Post(bindIgnErr(forms.AdminEditRunnerForm{}), admin.EditRunnerPost)
|
||||
m.Post("/{runnerid}/delete", admin.DeleteRunner)
|
||||
})
|
||||
}, func(ctx *context.Context) {
|
||||
ctx.Data["EnableOAuth2"] = setting.OAuth2.Enable
|
||||
ctx.Data["EnablePackages"] = setting.Packages.Enabled
|
||||
|
@ -24,7 +24,7 @@ func PushToQueue(task *bots_model.Build) {
|
||||
|
||||
// Dispatch assign a task to a runner
|
||||
func Dispatch(task *bots_model.Build) (*bots_model.Runner, error) {
|
||||
runner, err := bots_model.GetUsableRunner(bots_model.GetRunnerOptions{
|
||||
runner, err := bots_model.GetUsableRunner(bots_model.FindRunnerOptions{
|
||||
RepoID: task.RepoID,
|
||||
})
|
||||
if err != nil {
|
||||
|
@ -71,3 +71,27 @@ func (f *AdminDashboardForm) Validate(req *http.Request, errs binding.Errors) bi
|
||||
ctx := context.GetContext(req)
|
||||
return middleware.Validate(errs, ctx.Data, f, ctx.Locale)
|
||||
}
|
||||
|
||||
// AdminCreateRunnerForm form for admin to create runner
|
||||
type AdminCreateRunnerForm struct {
|
||||
Name string `binding:"Required"`
|
||||
Type string
|
||||
}
|
||||
|
||||
// Validate validates form fields
|
||||
func (f *AdminCreateRunnerForm) Validate(req *http.Request, errs binding.Errors) binding.Errors {
|
||||
ctx := context.GetContext(req)
|
||||
return middleware.Validate(errs, ctx.Data, f, ctx.Locale)
|
||||
}
|
||||
|
||||
// AdminEditRunnerForm form for admin to create runner
|
||||
type AdminEditRunnerForm struct {
|
||||
Name string `binding:"Required"`
|
||||
Type string
|
||||
}
|
||||
|
||||
// Validate validates form fields
|
||||
func (f *AdminEditRunnerForm) Validate(req *http.Request, errs binding.Errors) binding.Errors {
|
||||
ctx := context.GetContext(req)
|
||||
return middleware.Validate(errs, ctx.Data, f, ctx.Locale)
|
||||
}
|
||||
|
@ -33,6 +33,9 @@
|
||||
{{.locale.Tr "settings.applications"}}
|
||||
</a>
|
||||
{{end}}
|
||||
<a class="{{if .PageIsAdminRunners}}active{{end}} item" href="{{AppSubUrl}}/admin/runners">
|
||||
{{.locale.Tr "admin.runners"}}
|
||||
</a>
|
||||
<a class="{{if .PageIsAdminConfig}}active{{end}} item" href="{{AppSubUrl}}/admin/config">
|
||||
{{.locale.Tr "admin.config"}}
|
||||
</a>
|
||||
|
209
templates/admin/runner/edit.tmpl
Normal file
209
templates/admin/runner/edit.tmpl
Normal file
@ -0,0 +1,209 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="page-content admin edit user">
|
||||
{{template "admin/navbar" .}}
|
||||
<div class="ui container">
|
||||
{{template "base/alert" .}}
|
||||
<h4 class="ui top attached header">
|
||||
{{.i18n.Tr "admin.users.edit_account"}}
|
||||
</h4>
|
||||
<div class="ui attached segment">
|
||||
<form class="ui form" action="{{.Link}}" method="post">
|
||||
{{template "base/disable_form_autofill"}}
|
||||
{{.CsrfTokenHtml}}
|
||||
<div class="field {{if .Err_UserName}}error{{end}}">
|
||||
<label for="user_name">{{.i18n.Tr "username"}}</label>
|
||||
<input id="user_name" name="user_name" value="{{.User.Name}}" autofocus {{if not .User.IsLocal }}disabled{{end}}>
|
||||
</div>
|
||||
<!-- Types and name -->
|
||||
<div class="inline required field {{if .Err_LoginType}}error{{end}}">
|
||||
<label>{{.i18n.Tr "admin.users.auth_source"}}</label>
|
||||
<div class="ui selection type dropdown">
|
||||
<input type="hidden" id="login_type" name="login_type" value="{{.LoginSource.Type.Int}}-{{.LoginSource.ID}}" required>
|
||||
<div class="text">{{.i18n.Tr "admin.users.local"}}</div>
|
||||
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
|
||||
<div class="menu">
|
||||
<div class="item" data-value="0-0">{{.i18n.Tr "admin.users.local"}}</div>
|
||||
{{range .Sources}}
|
||||
<div class="item" data-value="{{.Type.Int}}-{{.ID}}">{{.Name}}</div>
|
||||
{{end}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="inline field {{if .Err_Visibility}}error{{end}}">
|
||||
<span class="inline required field"><label for="visibility">{{.i18n.Tr "settings.visibility"}}</label></span>
|
||||
<div class="ui selection type dropdown">
|
||||
{{if .User.Visibility.IsPublic}}<input type="hidden" id="visibility" name="visibility" value="0">{{end}}
|
||||
{{if .User.Visibility.IsLimited}}<input type="hidden" id="visibility" name="visibility" value="1">{{end}}
|
||||
{{if .User.Visibility.IsPrivate}}<input type="hidden" id="visibility" name="visibility" value="2">{{end}}
|
||||
<div class="text">
|
||||
{{if .User.Visibility.IsPublic}}{{.i18n.Tr "settings.visibility.public"}}{{end}}
|
||||
{{if .User.Visibility.IsLimited}}{{.i18n.Tr "settings.visibility.limited"}}{{end}}
|
||||
{{if .User.Visibility.IsPrivate}}{{.i18n.Tr "settings.visibility.private"}}{{end}}
|
||||
</div>
|
||||
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
|
||||
<div class="menu">
|
||||
{{range $mode := .AllowedUserVisibilityModes}}
|
||||
{{if $mode.IsPublic}}
|
||||
<div class="item tooltip" data-content="{{$.i18n.Tr "settings.visibility.public_tooltip"}}" data-value="0">{{$.i18n.Tr "settings.visibility.public"}}</div>
|
||||
{{else if $mode.IsLimited}}
|
||||
<div class="item tooltip" data-content="{{$.i18n.Tr "settings.visibility.limited_tooltip"}}" data-value="1">{{$.i18n.Tr "settings.visibility.limited"}}</div>
|
||||
{{else if $mode.IsPrivate}}
|
||||
<div class="item tooltip" data-content="{{$.i18n.Tr "settings.visibility.private_tooltip"}}" data-value="2">{{$.i18n.Tr "settings.visibility.private"}}</div>
|
||||
{{end}}
|
||||
{{end}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="required non-local field {{if .Err_LoginName}}error{{end}} {{if eq .User.LoginSource 0}}hide{{end}}">
|
||||
<label for="login_name">{{.i18n.Tr "admin.users.auth_login_name"}}</label>
|
||||
<input id="login_name" name="login_name" value="{{.User.LoginName}}" autofocus>
|
||||
</div>
|
||||
<div class="field {{if .Err_FullName}}error{{end}}">
|
||||
<label for="full_name">{{.i18n.Tr "settings.full_name"}}</label>
|
||||
<input id="full_name" name="full_name" value="{{.User.FullName}}">
|
||||
</div>
|
||||
<div class="required field {{if .Err_Email}}error{{end}}">
|
||||
<label for="email">{{.i18n.Tr "email"}}</label>
|
||||
<input id="email" name="email" type="email" value="{{.User.Email}}" autofocus required>
|
||||
</div>
|
||||
<div class="local field {{if .Err_Password}}error{{end}} {{if not (or (.User.IsLocal) (.User.IsOAuth2))}}hide{{end}}">
|
||||
<label for="password">{{.i18n.Tr "password"}}</label>
|
||||
<input id="password" name="password" type="password" autocomplete="new-password">
|
||||
<p class="help">{{.i18n.Tr "admin.users.password_helper"}}</p>
|
||||
</div>
|
||||
<div class="field {{if .Err_Website}}error{{end}}">
|
||||
<label for="website">{{.i18n.Tr "settings.website"}}</label>
|
||||
<input id="website" name="website" type="url" value="{{.User.Website}}" placeholder="e.g. http://mydomain.com or https://mydomain.com">
|
||||
</div>
|
||||
<div class="field {{if .Err_Location}}error{{end}}">
|
||||
<label for="location">{{.i18n.Tr "settings.location"}}</label>
|
||||
<input id="location" name="location" value="{{.User.Location}}">
|
||||
</div>
|
||||
|
||||
<div class="ui divider"></div>
|
||||
|
||||
<div class="inline field {{if .Err_MaxRepoCreation}}error{{end}}">
|
||||
<label for="max_repo_creation">{{.i18n.Tr "admin.users.max_repo_creation"}}</label>
|
||||
<input id="max_repo_creation" name="max_repo_creation" type="number" value="{{.User.MaxRepoCreation}}">
|
||||
<p class="help">{{.i18n.Tr "admin.users.max_repo_creation_desc"}}</p>
|
||||
</div>
|
||||
|
||||
<div class="ui divider"></div>
|
||||
|
||||
<div class="inline field">
|
||||
<div class="ui checkbox">
|
||||
<label><strong>{{.i18n.Tr "admin.users.is_activated"}}</strong></label>
|
||||
<input name="active" type="checkbox" {{if .User.IsActive}}checked{{end}}>
|
||||
</div>
|
||||
</div>
|
||||
<div class="inline field">
|
||||
<div class="ui checkbox">
|
||||
<label><strong>{{.i18n.Tr "admin.users.prohibit_login"}}</strong></label>
|
||||
<input name="prohibit_login" type="checkbox" {{if .User.ProhibitLogin}}checked{{end}} {{if (eq .User.ID .SignedUserID)}}disabled{{end}}>
|
||||
</div>
|
||||
</div>
|
||||
<div class="inline field">
|
||||
<div class="ui checkbox">
|
||||
<label><strong>{{.i18n.Tr "admin.users.is_admin"}}</strong></label>
|
||||
<input name="admin" type="checkbox" {{if .User.IsAdmin}}checked{{end}}>
|
||||
</div>
|
||||
</div>
|
||||
<div class="inline field">
|
||||
<div class="ui checkbox">
|
||||
<label><strong>{{.i18n.Tr "admin.users.is_restricted"}}</strong></label>
|
||||
<input name="restricted" type="checkbox" {{if .User.IsRestricted}}checked{{end}}>
|
||||
</div>
|
||||
</div>
|
||||
<div class="inline field"{{if DisableGitHooks}} hidden{{end}}>
|
||||
<div class="ui checkbox tooltip" data-content="{{.i18n.Tr "admin.users.allow_git_hook_tooltip"}}" data-variation="very wide">
|
||||
<label><strong>{{.i18n.Tr "admin.users.allow_git_hook"}}</strong></label>
|
||||
<input name="allow_git_hook" type="checkbox" {{if .User.CanEditGitHook}}checked{{end}} {{if DisableGitHooks}}disabled{{end}}>
|
||||
</div>
|
||||
</div>
|
||||
<div class="inline field" {{if or (DisableImportLocal) (.DisableMigrations)}}hidden{{end}}>
|
||||
<div class="ui checkbox">
|
||||
<label><strong>{{.i18n.Tr "admin.users.allow_import_local"}}</strong></label>
|
||||
<input name="allow_import_local" type="checkbox" {{if .User.CanImportLocal}}checked{{end}} {{if DisableImportLocal}}disabled{{end}}>
|
||||
</div>
|
||||
</div>
|
||||
{{if not .DisableRegularOrgCreation}}
|
||||
<div class="inline field">
|
||||
<div class="ui checkbox">
|
||||
<label><strong>{{.i18n.Tr "admin.users.allow_create_organization"}}</strong></label>
|
||||
<input name="allow_create_organization" type="checkbox" {{if .User.CanCreateOrganization}}checked{{end}}>
|
||||
</div>
|
||||
</div>
|
||||
{{end}}
|
||||
|
||||
{{if .TwoFactorEnabled}}
|
||||
<div class="ui divider"></div>
|
||||
<div class="inline field">
|
||||
<div class="ui checkbox">
|
||||
<label><strong>{{.i18n.Tr "admin.users.reset_2fa"}}</strong></label>
|
||||
<input name="reset_2fa" type="checkbox">
|
||||
</div>
|
||||
</div>
|
||||
{{end}}
|
||||
|
||||
<div class="ui divider"></div>
|
||||
|
||||
<div class="field">
|
||||
<button class="ui green button">{{.i18n.Tr "admin.users.update_profile"}}</button>
|
||||
<div class="ui red button delete-button" data-url="{{$.Link}}/delete" data-id="{{.User.ID}}">{{.i18n.Tr "admin.users.delete_account"}}</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<h4 class="ui top attached header">
|
||||
{{.i18n.Tr "settings.avatar"}}
|
||||
</h4>
|
||||
<div class="ui attached segment">
|
||||
<form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data">
|
||||
{{.CsrfTokenHtml}}
|
||||
{{if not DisableGravatar}}
|
||||
<div class="inline field">
|
||||
<div class="ui radio checkbox">
|
||||
<input name="source" value="lookup" type="radio" {{if not .User.UseCustomAvatar}}checked{{end}}>
|
||||
<label>{{.i18n.Tr "settings.lookup_avatar_by_mail"}}</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="field {{if .Err_Gravatar}}error{{end}}">
|
||||
<label for="gravatar">Avatar {{.i18n.Tr "email"}}</label>
|
||||
<input id="gravatar" name="gravatar" value="{{.User.AvatarEmail}}" />
|
||||
</div>
|
||||
{{end}}
|
||||
|
||||
<div class="inline field">
|
||||
<div class="ui radio checkbox">
|
||||
<input name="source" value="local" type="radio" {{if .User.UseCustomAvatar}}checked{{end}}>
|
||||
<label>{{.i18n.Tr "settings.enable_custom_avatar"}}</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="inline field">
|
||||
<label for="avatar">{{.i18n.Tr "settings.choose_new_avatar"}}</label>
|
||||
<input name="avatar" type="file" >
|
||||
</div>
|
||||
|
||||
<div class="field">
|
||||
<button class="ui green button">{{$.i18n.Tr "settings.update_avatar"}}</button>
|
||||
<a class="ui red button delete-post" data-request-url="{{.Link}}/avatar/delete" data-done-url="{{.Link}}">{{$.i18n.Tr "settings.delete_current_avatar"}}</a>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="ui small basic delete modal">
|
||||
<div class="ui icon header">
|
||||
{{svg "octicon-trash"}}
|
||||
{{.i18n.Tr "settings.delete_account_title"}}
|
||||
</div>
|
||||
<div class="content">
|
||||
<p>{{.i18n.Tr "settings.delete_account_desc"}}</p>
|
||||
</div>
|
||||
{{template "base/delete_modal_actions" .}}
|
||||
</div>
|
||||
{{template "base/footer" .}}
|
53
templates/admin/runner/list.tmpl
Normal file
53
templates/admin/runner/list.tmpl
Normal file
@ -0,0 +1,53 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="page-content admin user">
|
||||
{{template "admin/navbar" .}}
|
||||
<div class="ui container">
|
||||
{{template "base/alert" .}}
|
||||
<h4 class="ui top attached header">
|
||||
{{.i18n.Tr "admin.runners.runner_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
|
||||
<div class="ui right">
|
||||
<a class="ui primary tiny button" href="{{AppSubUrl}}/admin/runners/new">{{.i18n.Tr "admin.runners.new"}}</a>
|
||||
</div>
|
||||
</h4>
|
||||
<div class="ui attached segment">
|
||||
<form class="ui form ignore-dirty" id="user-list-search-form">
|
||||
<!-- Search Text -->
|
||||
<div class="ui fluid action input" style="max-width: 70%;">
|
||||
<input name="q" value="{{.Keyword}}" placeholder="{{.i18n.Tr "explore.search"}}..." autofocus>
|
||||
<button class="ui primary button">{{.i18n.Tr "explore.search"}}</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div class="ui attached table segment">
|
||||
<table class="ui very basic striped table unstackable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-sortt-asc="oldest" data-sortt-desc="newest">ID</th>
|
||||
<th data-sortt-asc="alphabetically">
|
||||
{{.i18n.Tr "admin.runners.name"}}
|
||||
</th>
|
||||
<th>{{.i18n.Tr "admin.runners.own_type"}}</th>
|
||||
<th>{{.i18n.Tr "admin.runners.uuid"}}</th>
|
||||
<th>{{.i18n.Tr "admin.runners.created"}}</th>
|
||||
<th>{{.i18n.Tr "admin.runners.edit"}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{{range .Runners}}
|
||||
<tr>
|
||||
<td>{{.ID}}</td>
|
||||
<td>{{.Name}}</td>
|
||||
<td>{{.OwnType}}</td>
|
||||
<td>{{.UUID}}</td>
|
||||
<td>{{.Created}}</td>
|
||||
<td><a href="{{$.Link}}/{{.ID}}">{{svg "octicon-pencil"}}</a></td>
|
||||
</tr>
|
||||
{{end}}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
{{template "base/paginate" .}}
|
||||
</div>
|
||||
</div>
|
||||
{{template "base/footer" .}}
|
94
templates/admin/runner/new.tmpl
Normal file
94
templates/admin/runner/new.tmpl
Normal file
@ -0,0 +1,94 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="page-content admin new user">
|
||||
{{template "admin/navbar" .}}
|
||||
<div class="ui container">
|
||||
{{template "base/alert" .}}
|
||||
<h4 class="ui top attached header">
|
||||
{{.i18n.Tr "admin.users.new_account"}}
|
||||
</h4>
|
||||
<div class="ui attached segment">
|
||||
<form class="ui form" action="{{.Link}}" method="post">
|
||||
{{template "base/disable_form_autofill"}}
|
||||
{{.CsrfTokenHtml}}
|
||||
<!-- Types and name -->
|
||||
<div class="inline required field {{if .Err_LoginType}}error{{end}}">
|
||||
<label>{{.i18n.Tr "admin.users.auth_source"}}</label>
|
||||
<div class="ui selection type dropdown">
|
||||
<input type="hidden" id="login_type" name="login_type" value="{{.login_type}}" data-password="required" required>
|
||||
<div class="text">{{.i18n.Tr "admin.users.local"}}</div>
|
||||
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
|
||||
<div class="menu">
|
||||
<div class="item" data-value="0-0">{{.i18n.Tr "admin.users.local"}}</div>
|
||||
{{range .Sources}}
|
||||
<div class="item" data-value="{{.Type.Int}}-{{.ID}}">{{.Name}}</div>
|
||||
{{end}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="inline field {{if .Err_Visibility}}error{{end}}">
|
||||
<span class="inline required field"><label for="visibility">{{.i18n.Tr "settings.visibility"}}</label></span>
|
||||
<div class="ui selection type dropdown">
|
||||
<input type="hidden" id="visibility" name="visibility" value="{{if .visibility}}{{.visibility}}{{else}}{{printf "%d" .DefaultUserVisibilityMode}}{{end}}">
|
||||
<div class="text">
|
||||
{{if .DefaultUserVisibilityMode.IsPublic}}{{.i18n.Tr "settings.visibility.public"}}{{end}}
|
||||
{{if .DefaultUserVisibilityMode.IsLimited}}{{.i18n.Tr "settings.visibility.limited"}}{{end}}
|
||||
{{if .DefaultUserVisibilityMode.IsPrivate}}{{.i18n.Tr "settings.visibility.private"}}{{end}}
|
||||
</div>
|
||||
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
|
||||
<div class="menu">
|
||||
{{range $mode := .AllowedUserVisibilityModes}}
|
||||
{{if $mode.IsPublic}}
|
||||
<div class="item tooltip" data-content="{{$.i18n.Tr "settings.visibility.public_tooltip"}}" data-value="0">{{$.i18n.Tr "settings.visibility.public"}}</div>
|
||||
{{else if $mode.IsLimited}}
|
||||
<div class="item tooltip" data-content="{{$.i18n.Tr "settings.visibility.limited_tooltip"}}" data-value="1">{{$.i18n.Tr "settings.visibility.limited"}}</div>
|
||||
{{else if $mode.IsPrivate}}
|
||||
<div class="item tooltip" data-content="{{$.i18n.Tr "settings.visibility.private_tooltip"}}" data-value="2">{{$.i18n.Tr "settings.visibility.private"}}</div>
|
||||
{{end}}
|
||||
{{end}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="required non-local field {{if .Err_LoginName}}error{{end}} {{if eq .login_type "0-0"}}hide{{end}}">
|
||||
<label for="login_name">{{.i18n.Tr "admin.users.auth_login_name"}}</label>
|
||||
<input id="login_name" name="login_name" value="{{.login_name}}">
|
||||
</div>
|
||||
<div class="required field {{if .Err_UserName}}error{{end}}">
|
||||
<label for="user_name">{{.i18n.Tr "username"}}</label>
|
||||
<input id="user_name" type="text" name="user_name" value="{{.user_name}}" autofocus required>
|
||||
</div>
|
||||
<div class="required field {{if .Err_Email}}error{{end}}">
|
||||
<label for="email">{{.i18n.Tr "email"}}</label>
|
||||
<input id="email" name="email" type="email" value="{{.email}}" required>
|
||||
</div>
|
||||
<div class="required local field {{if .Err_Password}}error{{end}} {{if not (eq .login_type "0-0")}}hide{{end}}">
|
||||
<label for="password">{{.i18n.Tr "password"}}</label>
|
||||
<input id="password" name="password" type="password" autocomplete="new-password" value="{{.password}}" {{if eq .login_type "0-0"}}required{{end}}>
|
||||
</div>
|
||||
|
||||
<div class="inline field local{{if ne .login_type "0-0"}} hide{{end}}">
|
||||
<div class="ui checkbox">
|
||||
<label><strong>{{.i18n.Tr "auth.allow_password_change" }}</strong></label>
|
||||
<input name="must_change_password" type="checkbox" checked>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Send register notify e-mail -->
|
||||
{{if .CanSendEmail}}
|
||||
<div class="inline field">
|
||||
<div class="ui checkbox">
|
||||
<label><strong>{{.i18n.Tr "admin.users.send_register_notify"}}</strong></label>
|
||||
<input name="send_notify" type="checkbox" {{if .send_notify}}checked{{end}}>
|
||||
</div>
|
||||
</div>
|
||||
{{end}}
|
||||
|
||||
<div class="field">
|
||||
<button class="ui green button">{{.i18n.Tr "admin.users.new_account"}}</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{{template "base/footer" .}}
|
@ -1,14 +1,12 @@
|
||||
<div class="issue-item-icon">
|
||||
{{if .IsPending}}
|
||||
<i class="commit-status circle icon gray"></i>
|
||||
{{end}}
|
||||
{{if .IsRunning}}
|
||||
<i class="commit-status circle icon yellow"></i>
|
||||
{{end}}
|
||||
{{if .IsSuccess}}
|
||||
<i class="commit-status check icon green"></i>
|
||||
{{end}}
|
||||
{{if .IsFailed}}
|
||||
<i class="commit-status warning icon red"></i>
|
||||
{{end}}
|
||||
</div>
|
||||
{{if .IsPending}}
|
||||
<i class="commit-status circle icon gray"></i>
|
||||
{{end}}
|
||||
{{if .IsRunning}}
|
||||
<i class="commit-status circle icon yellow"></i>
|
||||
{{end}}
|
||||
{{if .IsSuccess}}
|
||||
<i class="commit-status check icon green"></i>
|
||||
{{end}}
|
||||
{{if .IsFailed}}
|
||||
<i class="commit-status warning icon red"></i>
|
||||
{{end}}
|
||||
|
@ -4,8 +4,8 @@
|
||||
<div class="ui vertical following fluid accordion text menu">
|
||||
{{range $file, $jobs := .WorkflowsStatuses}}
|
||||
<div class="item">
|
||||
<a class="active title"><i class="dropdown icon"></i> <b>{{ $file }}</b></a>
|
||||
<div class="active content menu">
|
||||
<a class="title"><i class="dropdown icon"></i> <b>{{ $file }}</b></a>
|
||||
<div class="content">
|
||||
{{range $jobname, $job := $jobs}}
|
||||
{{template "repo/builds/status" $job.Status}}
|
||||
<a class="item" href="#{{$file}}__{{$jobname}}">{{ $jobname }}</a>
|
||||
|
Loading…
x
Reference in New Issue
Block a user