mirror of
https://github.com/go-gitea/gitea
synced 2024-11-25 06:02:49 +01:00
Merge branch 'main' into add-priority-to-ProtectedBranch
This commit is contained in:
commit
3614fad595
69 changed files with 4032 additions and 4012 deletions
|
@ -1007,6 +1007,14 @@ LEVEL = Info
|
||||||
;; The set of allowed values and rules are the same as DEFAULT_REPO_UNITS.
|
;; The set of allowed values and rules are the same as DEFAULT_REPO_UNITS.
|
||||||
;DEFAULT_FORK_REPO_UNITS = repo.code,repo.pulls
|
;DEFAULT_FORK_REPO_UNITS = repo.code,repo.pulls
|
||||||
;;
|
;;
|
||||||
|
;; Comma separated list of default mirror repo units.
|
||||||
|
;; The set of allowed values and rules are the same as DEFAULT_REPO_UNITS.
|
||||||
|
;DEFAULT_MIRROR_REPO_UNITS = repo.code,repo.releases,repo.issues,repo.wiki,repo.projects,repo.packages
|
||||||
|
;;
|
||||||
|
;; Comma separated list of default template repo units.
|
||||||
|
;; The set of allowed values and rules are the same as DEFAULT_REPO_UNITS.
|
||||||
|
;DEFAULT_TEMPLATE_REPO_UNITS = repo.code,repo.releases,repo.issues,repo.pulls,repo.wiki,repo.projects,repo.packages
|
||||||
|
;;
|
||||||
;; Prefix archive files by placing them in a directory named after the repository
|
;; Prefix archive files by placing them in a directory named after the repository
|
||||||
;PREFIX_ARCHIVE_FILES = true
|
;PREFIX_ARCHIVE_FILES = true
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -341,7 +341,7 @@ func UpdateTask(ctx context.Context, task *ActionTask, cols ...string) error {
|
||||||
// UpdateTaskByState updates the task by the state.
|
// UpdateTaskByState updates the task by the state.
|
||||||
// It will always update the task if the state is not final, even there is no change.
|
// It will always update the task if the state is not final, even there is no change.
|
||||||
// So it will update ActionTask.Updated to avoid the task being judged as a zombie task.
|
// So it will update ActionTask.Updated to avoid the task being judged as a zombie task.
|
||||||
func UpdateTaskByState(ctx context.Context, state *runnerv1.TaskState) (*ActionTask, error) {
|
func UpdateTaskByState(ctx context.Context, runnerID int64, state *runnerv1.TaskState) (*ActionTask, error) {
|
||||||
stepStates := map[int64]*runnerv1.StepState{}
|
stepStates := map[int64]*runnerv1.StepState{}
|
||||||
for _, v := range state.Steps {
|
for _, v := range state.Steps {
|
||||||
stepStates[v.Id] = v
|
stepStates[v.Id] = v
|
||||||
|
@ -360,6 +360,8 @@ func UpdateTaskByState(ctx context.Context, state *runnerv1.TaskState) (*ActionT
|
||||||
return nil, err
|
return nil, err
|
||||||
} else if !has {
|
} else if !has {
|
||||||
return nil, util.ErrNotExist
|
return nil, util.ErrNotExist
|
||||||
|
} else if runnerID != task.RunnerID {
|
||||||
|
return nil, fmt.Errorf("invalid runner for task")
|
||||||
}
|
}
|
||||||
|
|
||||||
if task.Status.IsDone() {
|
if task.Status.IsDone() {
|
||||||
|
|
|
@ -141,8 +141,9 @@ func (org *Organization) LoadTeams(ctx context.Context) ([]*Team, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetMembers returns all members of organization.
|
// GetMembers returns all members of organization.
|
||||||
func (org *Organization) GetMembers(ctx context.Context) (user_model.UserList, map[int64]bool, error) {
|
func (org *Organization) GetMembers(ctx context.Context, doer *user_model.User) (user_model.UserList, map[int64]bool, error) {
|
||||||
return FindOrgMembers(ctx, &FindOrgMembersOpts{
|
return FindOrgMembers(ctx, &FindOrgMembersOpts{
|
||||||
|
Doer: doer,
|
||||||
OrgID: org.ID,
|
OrgID: org.ID,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -195,16 +196,22 @@ func (org *Organization) CanCreateRepo() bool {
|
||||||
// FindOrgMembersOpts represensts find org members conditions
|
// FindOrgMembersOpts represensts find org members conditions
|
||||||
type FindOrgMembersOpts struct {
|
type FindOrgMembersOpts struct {
|
||||||
db.ListOptions
|
db.ListOptions
|
||||||
OrgID int64
|
Doer *user_model.User
|
||||||
PublicOnly bool
|
IsDoerMember bool
|
||||||
|
OrgID int64
|
||||||
|
}
|
||||||
|
|
||||||
|
func (opts FindOrgMembersOpts) PublicOnly() bool {
|
||||||
|
return opts.Doer == nil || !(opts.IsDoerMember || opts.Doer.IsAdmin)
|
||||||
}
|
}
|
||||||
|
|
||||||
// CountOrgMembers counts the organization's members
|
// CountOrgMembers counts the organization's members
|
||||||
func CountOrgMembers(ctx context.Context, opts *FindOrgMembersOpts) (int64, error) {
|
func CountOrgMembers(ctx context.Context, opts *FindOrgMembersOpts) (int64, error) {
|
||||||
sess := db.GetEngine(ctx).Where("org_id=?", opts.OrgID)
|
sess := db.GetEngine(ctx).Where("org_id=?", opts.OrgID)
|
||||||
if opts.PublicOnly {
|
if opts.PublicOnly() {
|
||||||
sess.And("is_public = ?", true)
|
sess.And("is_public = ?", true)
|
||||||
}
|
}
|
||||||
|
|
||||||
return sess.Count(new(OrgUser))
|
return sess.Count(new(OrgUser))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -525,9 +532,10 @@ func GetOrgsCanCreateRepoByUserID(ctx context.Context, userID int64) ([]*Organiz
|
||||||
// GetOrgUsersByOrgID returns all organization-user relations by organization ID.
|
// GetOrgUsersByOrgID returns all organization-user relations by organization ID.
|
||||||
func GetOrgUsersByOrgID(ctx context.Context, opts *FindOrgMembersOpts) ([]*OrgUser, error) {
|
func GetOrgUsersByOrgID(ctx context.Context, opts *FindOrgMembersOpts) ([]*OrgUser, error) {
|
||||||
sess := db.GetEngine(ctx).Where("org_id=?", opts.OrgID)
|
sess := db.GetEngine(ctx).Where("org_id=?", opts.OrgID)
|
||||||
if opts.PublicOnly {
|
if opts.PublicOnly() {
|
||||||
sess.And("is_public = ?", true)
|
sess.And("is_public = ?", true)
|
||||||
}
|
}
|
||||||
|
|
||||||
if opts.ListOptions.PageSize > 0 {
|
if opts.ListOptions.PageSize > 0 {
|
||||||
sess = db.SetSessionPagination(sess, opts)
|
sess = db.SetSessionPagination(sess, opts)
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
package organization_test
|
package organization_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"sort"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"code.gitea.io/gitea/models/db"
|
"code.gitea.io/gitea/models/db"
|
||||||
|
@ -103,7 +104,7 @@ func TestUser_GetTeams(t *testing.T) {
|
||||||
func TestUser_GetMembers(t *testing.T) {
|
func TestUser_GetMembers(t *testing.T) {
|
||||||
assert.NoError(t, unittest.PrepareTestDatabase())
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
||||||
org := unittest.AssertExistsAndLoadBean(t, &organization.Organization{ID: 3})
|
org := unittest.AssertExistsAndLoadBean(t, &organization.Organization{ID: 3})
|
||||||
members, _, err := org.GetMembers(db.DefaultContext)
|
members, _, err := org.GetMembers(db.DefaultContext, &user_model.User{IsAdmin: true})
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
if assert.Len(t, members, 3) {
|
if assert.Len(t, members, 3) {
|
||||||
assert.Equal(t, int64(2), members[0].ID)
|
assert.Equal(t, int64(2), members[0].ID)
|
||||||
|
@ -210,37 +211,42 @@ func TestFindOrgs(t *testing.T) {
|
||||||
func TestGetOrgUsersByOrgID(t *testing.T) {
|
func TestGetOrgUsersByOrgID(t *testing.T) {
|
||||||
assert.NoError(t, unittest.PrepareTestDatabase())
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
||||||
|
|
||||||
orgUsers, err := organization.GetOrgUsersByOrgID(db.DefaultContext, &organization.FindOrgMembersOpts{
|
opts := &organization.FindOrgMembersOpts{
|
||||||
ListOptions: db.ListOptions{},
|
Doer: &user_model.User{IsAdmin: true},
|
||||||
OrgID: 3,
|
OrgID: 3,
|
||||||
PublicOnly: false,
|
|
||||||
})
|
|
||||||
assert.NoError(t, err)
|
|
||||||
if assert.Len(t, orgUsers, 3) {
|
|
||||||
assert.Equal(t, organization.OrgUser{
|
|
||||||
ID: orgUsers[0].ID,
|
|
||||||
OrgID: 3,
|
|
||||||
UID: 2,
|
|
||||||
IsPublic: true,
|
|
||||||
}, *orgUsers[0])
|
|
||||||
assert.Equal(t, organization.OrgUser{
|
|
||||||
ID: orgUsers[1].ID,
|
|
||||||
OrgID: 3,
|
|
||||||
UID: 4,
|
|
||||||
IsPublic: false,
|
|
||||||
}, *orgUsers[1])
|
|
||||||
assert.Equal(t, organization.OrgUser{
|
|
||||||
ID: orgUsers[2].ID,
|
|
||||||
OrgID: 3,
|
|
||||||
UID: 28,
|
|
||||||
IsPublic: true,
|
|
||||||
}, *orgUsers[2])
|
|
||||||
}
|
}
|
||||||
|
assert.False(t, opts.PublicOnly())
|
||||||
|
orgUsers, err := organization.GetOrgUsersByOrgID(db.DefaultContext, opts)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
sort.Slice(orgUsers, func(i, j int) bool {
|
||||||
|
return orgUsers[i].ID < orgUsers[j].ID
|
||||||
|
})
|
||||||
|
assert.EqualValues(t, []*organization.OrgUser{{
|
||||||
|
ID: 1,
|
||||||
|
OrgID: 3,
|
||||||
|
UID: 2,
|
||||||
|
IsPublic: true,
|
||||||
|
}, {
|
||||||
|
ID: 2,
|
||||||
|
OrgID: 3,
|
||||||
|
UID: 4,
|
||||||
|
IsPublic: false,
|
||||||
|
}, {
|
||||||
|
ID: 9,
|
||||||
|
OrgID: 3,
|
||||||
|
UID: 28,
|
||||||
|
IsPublic: true,
|
||||||
|
}}, orgUsers)
|
||||||
|
|
||||||
|
opts = &organization.FindOrgMembersOpts{OrgID: 3}
|
||||||
|
assert.True(t, opts.PublicOnly())
|
||||||
|
orgUsers, err = organization.GetOrgUsersByOrgID(db.DefaultContext, opts)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Len(t, orgUsers, 2)
|
||||||
|
|
||||||
orgUsers, err = organization.GetOrgUsersByOrgID(db.DefaultContext, &organization.FindOrgMembersOpts{
|
orgUsers, err = organization.GetOrgUsersByOrgID(db.DefaultContext, &organization.FindOrgMembersOpts{
|
||||||
ListOptions: db.ListOptions{},
|
ListOptions: db.ListOptions{},
|
||||||
OrgID: unittest.NonexistentID,
|
OrgID: unittest.NonexistentID,
|
||||||
PublicOnly: false,
|
|
||||||
})
|
})
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Len(t, orgUsers, 0)
|
assert.Len(t, orgUsers, 0)
|
||||||
|
|
|
@ -94,7 +94,7 @@ func TestUserListIsPublicMember(t *testing.T) {
|
||||||
func testUserListIsPublicMember(t *testing.T, orgID int64, expected map[int64]bool) {
|
func testUserListIsPublicMember(t *testing.T, orgID int64, expected map[int64]bool) {
|
||||||
org, err := organization.GetOrgByID(db.DefaultContext, orgID)
|
org, err := organization.GetOrgByID(db.DefaultContext, orgID)
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
_, membersIsPublic, err := org.GetMembers(db.DefaultContext)
|
_, membersIsPublic, err := org.GetMembers(db.DefaultContext, &user_model.User{IsAdmin: true})
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Equal(t, expected, membersIsPublic)
|
assert.Equal(t, expected, membersIsPublic)
|
||||||
}
|
}
|
||||||
|
@ -121,7 +121,7 @@ func TestUserListIsUserOrgOwner(t *testing.T) {
|
||||||
func testUserListIsUserOrgOwner(t *testing.T, orgID int64, expected map[int64]bool) {
|
func testUserListIsUserOrgOwner(t *testing.T, orgID int64, expected map[int64]bool) {
|
||||||
org, err := organization.GetOrgByID(db.DefaultContext, orgID)
|
org, err := organization.GetOrgByID(db.DefaultContext, orgID)
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
members, _, err := org.GetMembers(db.DefaultContext)
|
members, _, err := org.GetMembers(db.DefaultContext, &user_model.User{IsAdmin: true})
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Equal(t, expected, organization.IsUserOrgOwner(db.DefaultContext, members, orgID))
|
assert.Equal(t, expected, organization.IsUserOrgOwner(db.DefaultContext, members, orgID))
|
||||||
}
|
}
|
||||||
|
|
|
@ -80,6 +80,27 @@ var (
|
||||||
TypePullRequests,
|
TypePullRequests,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DefaultMirrorRepoUnits contains the default unit types for mirrors
|
||||||
|
DefaultMirrorRepoUnits = []Type{
|
||||||
|
TypeCode,
|
||||||
|
TypeIssues,
|
||||||
|
TypeReleases,
|
||||||
|
TypeWiki,
|
||||||
|
TypeProjects,
|
||||||
|
TypePackages,
|
||||||
|
}
|
||||||
|
|
||||||
|
// DefaultTemplateRepoUnits contains the default unit types for templates
|
||||||
|
DefaultTemplateRepoUnits = []Type{
|
||||||
|
TypeCode,
|
||||||
|
TypeIssues,
|
||||||
|
TypePullRequests,
|
||||||
|
TypeReleases,
|
||||||
|
TypeWiki,
|
||||||
|
TypeProjects,
|
||||||
|
TypePackages,
|
||||||
|
}
|
||||||
|
|
||||||
// NotAllowedDefaultRepoUnits contains units that can't be default
|
// NotAllowedDefaultRepoUnits contains units that can't be default
|
||||||
NotAllowedDefaultRepoUnits = []Type{
|
NotAllowedDefaultRepoUnits = []Type{
|
||||||
TypeExternalWiki,
|
TypeExternalWiki,
|
||||||
|
@ -147,6 +168,7 @@ func LoadUnitConfig() error {
|
||||||
if len(DefaultRepoUnits) == 0 {
|
if len(DefaultRepoUnits) == 0 {
|
||||||
return errors.New("no default repository units found")
|
return errors.New("no default repository units found")
|
||||||
}
|
}
|
||||||
|
// default fork repo units
|
||||||
setDefaultForkRepoUnits, invalidKeys := FindUnitTypes(setting.Repository.DefaultForkRepoUnits...)
|
setDefaultForkRepoUnits, invalidKeys := FindUnitTypes(setting.Repository.DefaultForkRepoUnits...)
|
||||||
if len(invalidKeys) > 0 {
|
if len(invalidKeys) > 0 {
|
||||||
log.Warn("Invalid keys in default fork repo units: %s", strings.Join(invalidKeys, ", "))
|
log.Warn("Invalid keys in default fork repo units: %s", strings.Join(invalidKeys, ", "))
|
||||||
|
@ -155,6 +177,24 @@ func LoadUnitConfig() error {
|
||||||
if len(DefaultForkRepoUnits) == 0 {
|
if len(DefaultForkRepoUnits) == 0 {
|
||||||
return errors.New("no default fork repository units found")
|
return errors.New("no default fork repository units found")
|
||||||
}
|
}
|
||||||
|
// default mirror repo units
|
||||||
|
setDefaultMirrorRepoUnits, invalidKeys := FindUnitTypes(setting.Repository.DefaultMirrorRepoUnits...)
|
||||||
|
if len(invalidKeys) > 0 {
|
||||||
|
log.Warn("Invalid keys in default mirror repo units: %s", strings.Join(invalidKeys, ", "))
|
||||||
|
}
|
||||||
|
DefaultMirrorRepoUnits = validateDefaultRepoUnits(DefaultMirrorRepoUnits, setDefaultMirrorRepoUnits)
|
||||||
|
if len(DefaultMirrorRepoUnits) == 0 {
|
||||||
|
return errors.New("no default mirror repository units found")
|
||||||
|
}
|
||||||
|
// default template repo units
|
||||||
|
setDefaultTemplateRepoUnits, invalidKeys := FindUnitTypes(setting.Repository.DefaultTemplateRepoUnits...)
|
||||||
|
if len(invalidKeys) > 0 {
|
||||||
|
log.Warn("Invalid keys in default template repo units: %s", strings.Join(invalidKeys, ", "))
|
||||||
|
}
|
||||||
|
DefaultTemplateRepoUnits = validateDefaultRepoUnits(DefaultTemplateRepoUnits, setDefaultTemplateRepoUnits)
|
||||||
|
if len(DefaultTemplateRepoUnits) == 0 {
|
||||||
|
return errors.New("no default template repository units found")
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -147,6 +147,9 @@ func StringsToInt64s(strs []string) ([]int64, error) {
|
||||||
}
|
}
|
||||||
ints := make([]int64, 0, len(strs))
|
ints := make([]int64, 0, len(strs))
|
||||||
for _, s := range strs {
|
for _, s := range strs {
|
||||||
|
if s == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
n, err := strconv.ParseInt(s, 10, 64)
|
n, err := strconv.ParseInt(s, 10, 64)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|
|
@ -152,6 +152,7 @@ func TestStringsToInt64s(t *testing.T) {
|
||||||
}
|
}
|
||||||
testSuccess(nil, nil)
|
testSuccess(nil, nil)
|
||||||
testSuccess([]string{}, []int64{})
|
testSuccess([]string{}, []int64{})
|
||||||
|
testSuccess([]string{""}, []int64{})
|
||||||
testSuccess([]string{"-1234"}, []int64{-1234})
|
testSuccess([]string{"-1234"}, []int64{-1234})
|
||||||
testSuccess([]string{"1", "4", "16", "64", "256"}, []int64{1, 4, 16, 64, 256})
|
testSuccess([]string{"1", "4", "16", "64", "256"}, []int64{1, 4, 16, 64, 256})
|
||||||
|
|
||||||
|
|
|
@ -31,8 +31,8 @@ func (s Set[T]) AddMultiple(values ...T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Contains determines whether a set contains the specified elements.
|
// Contains determines whether a set contains all these elements.
|
||||||
// Returns true if the set contains the specified element; otherwise, false.
|
// Returns true if the set contains all these elements; otherwise, false.
|
||||||
func (s Set[T]) Contains(values ...T) bool {
|
func (s Set[T]) Contains(values ...T) bool {
|
||||||
ret := true
|
ret := true
|
||||||
for _, value := range values {
|
for _, value := range values {
|
||||||
|
|
|
@ -18,7 +18,9 @@ func TestSet(t *testing.T) {
|
||||||
|
|
||||||
assert.True(t, s.Contains("key1"))
|
assert.True(t, s.Contains("key1"))
|
||||||
assert.True(t, s.Contains("key2"))
|
assert.True(t, s.Contains("key2"))
|
||||||
|
assert.True(t, s.Contains("key1", "key2"))
|
||||||
assert.False(t, s.Contains("key3"))
|
assert.False(t, s.Contains("key3"))
|
||||||
|
assert.False(t, s.Contains("key1", "key3"))
|
||||||
|
|
||||||
assert.True(t, s.Remove("key2"))
|
assert.True(t, s.Remove("key2"))
|
||||||
assert.False(t, s.Contains("key2"))
|
assert.False(t, s.Contains("key2"))
|
||||||
|
|
|
@ -43,6 +43,8 @@ var (
|
||||||
DisabledRepoUnits []string
|
DisabledRepoUnits []string
|
||||||
DefaultRepoUnits []string
|
DefaultRepoUnits []string
|
||||||
DefaultForkRepoUnits []string
|
DefaultForkRepoUnits []string
|
||||||
|
DefaultMirrorRepoUnits []string
|
||||||
|
DefaultTemplateRepoUnits []string
|
||||||
PrefixArchiveFiles bool
|
PrefixArchiveFiles bool
|
||||||
DisableMigrations bool
|
DisableMigrations bool
|
||||||
DisableStars bool `ini:"DISABLE_STARS"`
|
DisableStars bool `ini:"DISABLE_STARS"`
|
||||||
|
@ -161,6 +163,8 @@ var (
|
||||||
DisabledRepoUnits: []string{},
|
DisabledRepoUnits: []string{},
|
||||||
DefaultRepoUnits: []string{},
|
DefaultRepoUnits: []string{},
|
||||||
DefaultForkRepoUnits: []string{},
|
DefaultForkRepoUnits: []string{},
|
||||||
|
DefaultMirrorRepoUnits: []string{},
|
||||||
|
DefaultTemplateRepoUnits: []string{},
|
||||||
PrefixArchiveFiles: true,
|
PrefixArchiveFiles: true,
|
||||||
DisableMigrations: false,
|
DisableMigrations: false,
|
||||||
DisableStars: false,
|
DisableStars: false,
|
||||||
|
|
|
@ -31,6 +31,7 @@ func NewFuncMap() template.FuncMap {
|
||||||
"ctx": func() any { return nil }, // template context function
|
"ctx": func() any { return nil }, // template context function
|
||||||
|
|
||||||
"DumpVar": dumpVar,
|
"DumpVar": dumpVar,
|
||||||
|
"NIL": func() any { return nil },
|
||||||
|
|
||||||
// -----------------------------------------------------------------
|
// -----------------------------------------------------------------
|
||||||
// html/template related functions
|
// html/template related functions
|
||||||
|
|
|
@ -175,7 +175,9 @@ func (s *Service) UpdateTask(
|
||||||
ctx context.Context,
|
ctx context.Context,
|
||||||
req *connect.Request[runnerv1.UpdateTaskRequest],
|
req *connect.Request[runnerv1.UpdateTaskRequest],
|
||||||
) (*connect.Response[runnerv1.UpdateTaskResponse], error) {
|
) (*connect.Response[runnerv1.UpdateTaskResponse], error) {
|
||||||
task, err := actions_model.UpdateTaskByState(ctx, req.Msg.State)
|
runner := GetRunner(ctx)
|
||||||
|
|
||||||
|
task, err := actions_model.UpdateTaskByState(ctx, runner.ID, req.Msg.State)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, status.Errorf(codes.Internal, "update task: %v", err)
|
return nil, status.Errorf(codes.Internal, "update task: %v", err)
|
||||||
}
|
}
|
||||||
|
@ -237,11 +239,15 @@ func (s *Service) UpdateLog(
|
||||||
ctx context.Context,
|
ctx context.Context,
|
||||||
req *connect.Request[runnerv1.UpdateLogRequest],
|
req *connect.Request[runnerv1.UpdateLogRequest],
|
||||||
) (*connect.Response[runnerv1.UpdateLogResponse], error) {
|
) (*connect.Response[runnerv1.UpdateLogResponse], error) {
|
||||||
|
runner := GetRunner(ctx)
|
||||||
|
|
||||||
res := connect.NewResponse(&runnerv1.UpdateLogResponse{})
|
res := connect.NewResponse(&runnerv1.UpdateLogResponse{})
|
||||||
|
|
||||||
task, err := actions_model.GetTaskByID(ctx, req.Msg.TaskId)
|
task, err := actions_model.GetTaskByID(ctx, req.Msg.TaskId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, status.Errorf(codes.Internal, "get task: %v", err)
|
return nil, status.Errorf(codes.Internal, "get task: %v", err)
|
||||||
|
} else if runner.ID != task.RunnerID {
|
||||||
|
return nil, status.Errorf(codes.Internal, "invalid runner for task")
|
||||||
}
|
}
|
||||||
ack := task.LogLength
|
ack := task.LogLength
|
||||||
|
|
||||||
|
|
|
@ -18,11 +18,12 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
// listMembers list an organization's members
|
// listMembers list an organization's members
|
||||||
func listMembers(ctx *context.APIContext, publicOnly bool) {
|
func listMembers(ctx *context.APIContext, isMember bool) {
|
||||||
opts := &organization.FindOrgMembersOpts{
|
opts := &organization.FindOrgMembersOpts{
|
||||||
OrgID: ctx.Org.Organization.ID,
|
Doer: ctx.Doer,
|
||||||
PublicOnly: publicOnly,
|
IsDoerMember: isMember,
|
||||||
ListOptions: utils.GetListOptions(ctx),
|
OrgID: ctx.Org.Organization.ID,
|
||||||
|
ListOptions: utils.GetListOptions(ctx),
|
||||||
}
|
}
|
||||||
|
|
||||||
count, err := organization.CountOrgMembers(ctx, opts)
|
count, err := organization.CountOrgMembers(ctx, opts)
|
||||||
|
@ -73,16 +74,19 @@ func ListMembers(ctx *context.APIContext) {
|
||||||
// "404":
|
// "404":
|
||||||
// "$ref": "#/responses/notFound"
|
// "$ref": "#/responses/notFound"
|
||||||
|
|
||||||
publicOnly := true
|
var (
|
||||||
|
isMember bool
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
|
||||||
if ctx.Doer != nil {
|
if ctx.Doer != nil {
|
||||||
isMember, err := ctx.Org.Organization.IsOrgMember(ctx, ctx.Doer.ID)
|
isMember, err = ctx.Org.Organization.IsOrgMember(ctx, ctx.Doer.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.Error(http.StatusInternalServerError, "IsOrgMember", err)
|
ctx.Error(http.StatusInternalServerError, "IsOrgMember", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
publicOnly = !isMember && !ctx.Doer.IsAdmin
|
|
||||||
}
|
}
|
||||||
listMembers(ctx, publicOnly)
|
listMembers(ctx, isMember)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ListPublicMembers list an organization's public members
|
// ListPublicMembers list an organization's public members
|
||||||
|
@ -112,7 +116,7 @@ func ListPublicMembers(ctx *context.APIContext) {
|
||||||
// "404":
|
// "404":
|
||||||
// "$ref": "#/responses/notFound"
|
// "$ref": "#/responses/notFound"
|
||||||
|
|
||||||
listMembers(ctx, true)
|
listMembers(ctx, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
// IsMember check if a user is a member of an organization
|
// IsMember check if a user is a member of an organization
|
||||||
|
|
|
@ -95,10 +95,12 @@ func home(ctx *context.Context, viewRepositories bool) {
|
||||||
}
|
}
|
||||||
|
|
||||||
opts := &organization.FindOrgMembersOpts{
|
opts := &organization.FindOrgMembersOpts{
|
||||||
OrgID: org.ID,
|
Doer: ctx.Doer,
|
||||||
PublicOnly: ctx.Org.PublicMemberOnly,
|
OrgID: org.ID,
|
||||||
ListOptions: db.ListOptions{Page: 1, PageSize: 25},
|
IsDoerMember: ctx.Org.IsMember,
|
||||||
|
ListOptions: db.ListOptions{Page: 1, PageSize: 25},
|
||||||
}
|
}
|
||||||
|
|
||||||
members, _, err := organization.FindOrgMembers(ctx, opts)
|
members, _, err := organization.FindOrgMembers(ctx, opts)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.ServerError("FindOrgMembers", err)
|
ctx.ServerError("FindOrgMembers", err)
|
||||||
|
|
|
@ -34,8 +34,8 @@ func Members(ctx *context.Context) {
|
||||||
}
|
}
|
||||||
|
|
||||||
opts := &organization.FindOrgMembersOpts{
|
opts := &organization.FindOrgMembersOpts{
|
||||||
OrgID: org.ID,
|
Doer: ctx.Doer,
|
||||||
PublicOnly: true,
|
OrgID: org.ID,
|
||||||
}
|
}
|
||||||
|
|
||||||
if ctx.Doer != nil {
|
if ctx.Doer != nil {
|
||||||
|
@ -44,9 +44,9 @@ func Members(ctx *context.Context) {
|
||||||
ctx.Error(http.StatusInternalServerError, "IsOrgMember")
|
ctx.Error(http.StatusInternalServerError, "IsOrgMember")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
opts.PublicOnly = !isMember && !ctx.Doer.IsAdmin
|
opts.IsDoerMember = isMember
|
||||||
}
|
}
|
||||||
ctx.Data["PublicOnly"] = opts.PublicOnly
|
ctx.Data["PublicOnly"] = opts.PublicOnly()
|
||||||
|
|
||||||
total, err := organization.CountOrgMembers(ctx, opts)
|
total, err := organization.CountOrgMembers(ctx, opts)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -788,13 +788,13 @@ func CompareDiff(ctx *context.Context) {
|
||||||
|
|
||||||
if !nothingToCompare {
|
if !nothingToCompare {
|
||||||
// Setup information for new form.
|
// Setup information for new form.
|
||||||
RetrieveRepoMetas(ctx, ctx.Repo.Repository, true)
|
pageMetaData := retrieveRepoIssueMetaData(ctx, ctx.Repo.Repository, nil, true)
|
||||||
if ctx.Written() {
|
if ctx.Written() {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
RetrieveRepoReviewers(ctx, ctx.Repo.Repository, nil, true)
|
_, templateErrs := setTemplateIfExists(ctx, pullRequestTemplateKey, pullRequestTemplateCandidates, pageMetaData)
|
||||||
if ctx.Written() {
|
if len(templateErrs) > 0 {
|
||||||
return
|
ctx.Flash.Warning(renderErrorOfTemplates(ctx, templateErrs), true)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -808,11 +808,6 @@ func CompareDiff(ctx *context.Context) {
|
||||||
ctx.Data["Title"] = "Comparing " + base.ShortSha(beforeCommitID) + separator + base.ShortSha(afterCommitID)
|
ctx.Data["Title"] = "Comparing " + base.ShortSha(beforeCommitID) + separator + base.ShortSha(afterCommitID)
|
||||||
|
|
||||||
ctx.Data["IsDiffCompare"] = true
|
ctx.Data["IsDiffCompare"] = true
|
||||||
_, templateErrs := setTemplateIfExists(ctx, pullRequestTemplateKey, pullRequestTemplateCandidates)
|
|
||||||
|
|
||||||
if len(templateErrs) > 0 {
|
|
||||||
ctx.Flash.Warning(renderErrorOfTemplates(ctx, templateErrs), true)
|
|
||||||
}
|
|
||||||
|
|
||||||
if content, ok := ctx.Data["content"].(string); ok && content != "" {
|
if content, ok := ctx.Data["content"].(string); ok && content != "" {
|
||||||
// If a template content is set, prepend the "content". In this case that's only
|
// If a template content is set, prepend the "content". In this case that's only
|
||||||
|
|
File diff suppressed because it is too large
Load diff
472
routers/web/repo/issue_comment.go
Normal file
472
routers/web/repo/issue_comment.go
Normal file
|
@ -0,0 +1,472 @@
|
||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package repo
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"html/template"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
issues_model "code.gitea.io/gitea/models/issues"
|
||||||
|
user_model "code.gitea.io/gitea/models/user"
|
||||||
|
"code.gitea.io/gitea/modules/git"
|
||||||
|
"code.gitea.io/gitea/modules/log"
|
||||||
|
"code.gitea.io/gitea/modules/markup"
|
||||||
|
"code.gitea.io/gitea/modules/markup/markdown"
|
||||||
|
repo_module "code.gitea.io/gitea/modules/repository"
|
||||||
|
"code.gitea.io/gitea/modules/setting"
|
||||||
|
api "code.gitea.io/gitea/modules/structs"
|
||||||
|
"code.gitea.io/gitea/modules/web"
|
||||||
|
"code.gitea.io/gitea/services/context"
|
||||||
|
"code.gitea.io/gitea/services/convert"
|
||||||
|
"code.gitea.io/gitea/services/forms"
|
||||||
|
issue_service "code.gitea.io/gitea/services/issue"
|
||||||
|
pull_service "code.gitea.io/gitea/services/pull"
|
||||||
|
)
|
||||||
|
|
||||||
|
// NewComment create a comment for issue
|
||||||
|
func NewComment(ctx *context.Context) {
|
||||||
|
form := web.GetForm(ctx).(*forms.CreateCommentForm)
|
||||||
|
issue := GetActionIssue(ctx)
|
||||||
|
if ctx.Written() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if !ctx.IsSigned || (ctx.Doer.ID != issue.PosterID && !ctx.Repo.CanReadIssuesOrPulls(issue.IsPull)) {
|
||||||
|
if log.IsTrace() {
|
||||||
|
if ctx.IsSigned {
|
||||||
|
issueType := "issues"
|
||||||
|
if issue.IsPull {
|
||||||
|
issueType = "pulls"
|
||||||
|
}
|
||||||
|
log.Trace("Permission Denied: User %-v not the Poster (ID: %d) and cannot read %s in Repo %-v.\n"+
|
||||||
|
"User in Repo has Permissions: %-+v",
|
||||||
|
ctx.Doer,
|
||||||
|
issue.PosterID,
|
||||||
|
issueType,
|
||||||
|
ctx.Repo.Repository,
|
||||||
|
ctx.Repo.Permission)
|
||||||
|
} else {
|
||||||
|
log.Trace("Permission Denied: Not logged in")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.Error(http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if issue.IsLocked && !ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) && !ctx.Doer.IsAdmin {
|
||||||
|
ctx.JSONError(ctx.Tr("repo.issues.comment_on_locked"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var attachments []string
|
||||||
|
if setting.Attachment.Enabled {
|
||||||
|
attachments = form.Files
|
||||||
|
}
|
||||||
|
|
||||||
|
if ctx.HasError() {
|
||||||
|
ctx.JSONError(ctx.GetErrMsg())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var comment *issues_model.Comment
|
||||||
|
defer func() {
|
||||||
|
// Check if issue admin/poster changes the status of issue.
|
||||||
|
if (ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) || (ctx.IsSigned && issue.IsPoster(ctx.Doer.ID))) &&
|
||||||
|
(form.Status == "reopen" || form.Status == "close") &&
|
||||||
|
!(issue.IsPull && issue.PullRequest.HasMerged) {
|
||||||
|
// Duplication and conflict check should apply to reopen pull request.
|
||||||
|
var pr *issues_model.PullRequest
|
||||||
|
|
||||||
|
if form.Status == "reopen" && issue.IsPull {
|
||||||
|
pull := issue.PullRequest
|
||||||
|
var err error
|
||||||
|
pr, err = issues_model.GetUnmergedPullRequest(ctx, pull.HeadRepoID, pull.BaseRepoID, pull.HeadBranch, pull.BaseBranch, pull.Flow)
|
||||||
|
if err != nil {
|
||||||
|
if !issues_model.IsErrPullRequestNotExist(err) {
|
||||||
|
ctx.JSONError(ctx.Tr("repo.issues.dependency.pr_close_blocked"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Regenerate patch and test conflict.
|
||||||
|
if pr == nil {
|
||||||
|
issue.PullRequest.HeadCommitID = ""
|
||||||
|
pull_service.AddToTaskQueue(ctx, issue.PullRequest)
|
||||||
|
}
|
||||||
|
|
||||||
|
// check whether the ref of PR <refs/pulls/pr_index/head> in base repo is consistent with the head commit of head branch in the head repo
|
||||||
|
// get head commit of PR
|
||||||
|
if pull.Flow == issues_model.PullRequestFlowGithub {
|
||||||
|
prHeadRef := pull.GetGitRefName()
|
||||||
|
if err := pull.LoadBaseRepo(ctx); err != nil {
|
||||||
|
ctx.ServerError("Unable to load base repo", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
prHeadCommitID, err := git.GetFullCommitID(ctx, pull.BaseRepo.RepoPath(), prHeadRef)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("Get head commit Id of pr fail", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// get head commit of branch in the head repo
|
||||||
|
if err := pull.LoadHeadRepo(ctx); err != nil {
|
||||||
|
ctx.ServerError("Unable to load head repo", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if ok := git.IsBranchExist(ctx, pull.HeadRepo.RepoPath(), pull.BaseBranch); !ok {
|
||||||
|
// todo localize
|
||||||
|
ctx.JSONError("The origin branch is delete, cannot reopen.")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
headBranchRef := pull.GetGitHeadBranchRefName()
|
||||||
|
headBranchCommitID, err := git.GetFullCommitID(ctx, pull.HeadRepo.RepoPath(), headBranchRef)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("Get head commit Id of head branch fail", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
err = pull.LoadIssue(ctx)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("load the issue of pull request error", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if prHeadCommitID != headBranchCommitID {
|
||||||
|
// force push to base repo
|
||||||
|
err := git.Push(ctx, pull.HeadRepo.RepoPath(), git.PushOptions{
|
||||||
|
Remote: pull.BaseRepo.RepoPath(),
|
||||||
|
Branch: pull.HeadBranch + ":" + prHeadRef,
|
||||||
|
Force: true,
|
||||||
|
Env: repo_module.InternalPushingEnvironment(pull.Issue.Poster, pull.BaseRepo),
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("force push error", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if pr != nil {
|
||||||
|
ctx.Flash.Info(ctx.Tr("repo.pulls.open_unmerged_pull_exists", pr.Index))
|
||||||
|
} else {
|
||||||
|
isClosed := form.Status == "close"
|
||||||
|
if err := issue_service.ChangeStatus(ctx, issue, ctx.Doer, "", isClosed); err != nil {
|
||||||
|
log.Error("ChangeStatus: %v", err)
|
||||||
|
|
||||||
|
if issues_model.IsErrDependenciesLeft(err) {
|
||||||
|
if issue.IsPull {
|
||||||
|
ctx.JSONError(ctx.Tr("repo.issues.dependency.pr_close_blocked"))
|
||||||
|
} else {
|
||||||
|
ctx.JSONError(ctx.Tr("repo.issues.dependency.issue_close_blocked"))
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if err := stopTimerIfAvailable(ctx, ctx.Doer, issue); err != nil {
|
||||||
|
ctx.ServerError("CreateOrStopIssueStopwatch", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Trace("Issue [%d] status changed to closed: %v", issue.ID, issue.IsClosed)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Redirect to comment hashtag if there is any actual content.
|
||||||
|
typeName := "issues"
|
||||||
|
if issue.IsPull {
|
||||||
|
typeName = "pulls"
|
||||||
|
}
|
||||||
|
if comment != nil {
|
||||||
|
ctx.JSONRedirect(fmt.Sprintf("%s/%s/%d#%s", ctx.Repo.RepoLink, typeName, issue.Index, comment.HashTag()))
|
||||||
|
} else {
|
||||||
|
ctx.JSONRedirect(fmt.Sprintf("%s/%s/%d", ctx.Repo.RepoLink, typeName, issue.Index))
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Fix #321: Allow empty comments, as long as we have attachments.
|
||||||
|
if len(form.Content) == 0 && len(attachments) == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
comment, err := issue_service.CreateIssueComment(ctx, ctx.Doer, ctx.Repo.Repository, issue, form.Content, attachments)
|
||||||
|
if err != nil {
|
||||||
|
if errors.Is(err, user_model.ErrBlockedUser) {
|
||||||
|
ctx.JSONError(ctx.Tr("repo.issues.comment.blocked_user"))
|
||||||
|
} else {
|
||||||
|
ctx.ServerError("CreateIssueComment", err)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Trace("Comment created: %d/%d/%d", ctx.Repo.Repository.ID, issue.ID, comment.ID)
|
||||||
|
}
|
||||||
|
|
||||||
|
// UpdateCommentContent change comment of issue's content
|
||||||
|
func UpdateCommentContent(ctx *context.Context) {
|
||||||
|
comment, err := issues_model.GetCommentByID(ctx, ctx.PathParamInt64(":id"))
|
||||||
|
if err != nil {
|
||||||
|
ctx.NotFoundOrServerError("GetCommentByID", issues_model.IsErrCommentNotExist, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := comment.LoadIssue(ctx); err != nil {
|
||||||
|
ctx.NotFoundOrServerError("LoadIssue", issues_model.IsErrIssueNotExist, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if comment.Issue.RepoID != ctx.Repo.Repository.ID {
|
||||||
|
ctx.NotFound("CompareRepoID", issues_model.ErrCommentNotExist{})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if !ctx.IsSigned || (ctx.Doer.ID != comment.PosterID && !ctx.Repo.CanWriteIssuesOrPulls(comment.Issue.IsPull)) {
|
||||||
|
ctx.Error(http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if !comment.Type.HasContentSupport() {
|
||||||
|
ctx.Error(http.StatusNoContent)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
oldContent := comment.Content
|
||||||
|
newContent := ctx.FormString("content")
|
||||||
|
contentVersion := ctx.FormInt("content_version")
|
||||||
|
|
||||||
|
// allow to save empty content
|
||||||
|
comment.Content = newContent
|
||||||
|
if err = issue_service.UpdateComment(ctx, comment, contentVersion, ctx.Doer, oldContent); err != nil {
|
||||||
|
if errors.Is(err, user_model.ErrBlockedUser) {
|
||||||
|
ctx.JSONError(ctx.Tr("repo.issues.comment.blocked_user"))
|
||||||
|
} else if errors.Is(err, issues_model.ErrCommentAlreadyChanged) {
|
||||||
|
ctx.JSONError(ctx.Tr("repo.comments.edit.already_changed"))
|
||||||
|
} else {
|
||||||
|
ctx.ServerError("UpdateComment", err)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := comment.LoadAttachments(ctx); err != nil {
|
||||||
|
ctx.ServerError("LoadAttachments", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// when the update request doesn't intend to update attachments (eg: change checkbox state), ignore attachment updates
|
||||||
|
if !ctx.FormBool("ignore_attachments") {
|
||||||
|
if err := updateAttachments(ctx, comment, ctx.FormStrings("files[]")); err != nil {
|
||||||
|
ctx.ServerError("UpdateAttachments", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var renderedContent template.HTML
|
||||||
|
if comment.Content != "" {
|
||||||
|
renderedContent, err = markdown.RenderString(&markup.RenderContext{
|
||||||
|
Links: markup.Links{
|
||||||
|
Base: ctx.FormString("context"), // FIXME: <- IS THIS SAFE ?
|
||||||
|
},
|
||||||
|
Metas: ctx.Repo.Repository.ComposeMetas(ctx),
|
||||||
|
GitRepo: ctx.Repo.GitRepo,
|
||||||
|
Repo: ctx.Repo.Repository,
|
||||||
|
Ctx: ctx,
|
||||||
|
}, comment.Content)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("RenderString", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
contentEmpty := fmt.Sprintf(`<span class="no-content">%s</span>`, ctx.Tr("repo.issues.no_content"))
|
||||||
|
renderedContent = template.HTML(contentEmpty)
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.JSON(http.StatusOK, map[string]any{
|
||||||
|
"content": renderedContent,
|
||||||
|
"contentVersion": comment.ContentVersion,
|
||||||
|
"attachments": attachmentsHTML(ctx, comment.Attachments, comment.Content),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// DeleteComment delete comment of issue
|
||||||
|
func DeleteComment(ctx *context.Context) {
|
||||||
|
comment, err := issues_model.GetCommentByID(ctx, ctx.PathParamInt64(":id"))
|
||||||
|
if err != nil {
|
||||||
|
ctx.NotFoundOrServerError("GetCommentByID", issues_model.IsErrCommentNotExist, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := comment.LoadIssue(ctx); err != nil {
|
||||||
|
ctx.NotFoundOrServerError("LoadIssue", issues_model.IsErrIssueNotExist, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if comment.Issue.RepoID != ctx.Repo.Repository.ID {
|
||||||
|
ctx.NotFound("CompareRepoID", issues_model.ErrCommentNotExist{})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if !ctx.IsSigned || (ctx.Doer.ID != comment.PosterID && !ctx.Repo.CanWriteIssuesOrPulls(comment.Issue.IsPull)) {
|
||||||
|
ctx.Error(http.StatusForbidden)
|
||||||
|
return
|
||||||
|
} else if !comment.Type.HasContentSupport() {
|
||||||
|
ctx.Error(http.StatusNoContent)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err = issue_service.DeleteComment(ctx, ctx.Doer, comment); err != nil {
|
||||||
|
ctx.ServerError("DeleteComment", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.Status(http.StatusOK)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ChangeCommentReaction create a reaction for comment
|
||||||
|
func ChangeCommentReaction(ctx *context.Context) {
|
||||||
|
form := web.GetForm(ctx).(*forms.ReactionForm)
|
||||||
|
comment, err := issues_model.GetCommentByID(ctx, ctx.PathParamInt64(":id"))
|
||||||
|
if err != nil {
|
||||||
|
ctx.NotFoundOrServerError("GetCommentByID", issues_model.IsErrCommentNotExist, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := comment.LoadIssue(ctx); err != nil {
|
||||||
|
ctx.NotFoundOrServerError("LoadIssue", issues_model.IsErrIssueNotExist, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if comment.Issue.RepoID != ctx.Repo.Repository.ID {
|
||||||
|
ctx.NotFound("CompareRepoID", issues_model.ErrCommentNotExist{})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if !ctx.IsSigned || (ctx.Doer.ID != comment.PosterID && !ctx.Repo.CanReadIssuesOrPulls(comment.Issue.IsPull)) {
|
||||||
|
if log.IsTrace() {
|
||||||
|
if ctx.IsSigned {
|
||||||
|
issueType := "issues"
|
||||||
|
if comment.Issue.IsPull {
|
||||||
|
issueType = "pulls"
|
||||||
|
}
|
||||||
|
log.Trace("Permission Denied: User %-v not the Poster (ID: %d) and cannot read %s in Repo %-v.\n"+
|
||||||
|
"User in Repo has Permissions: %-+v",
|
||||||
|
ctx.Doer,
|
||||||
|
comment.Issue.PosterID,
|
||||||
|
issueType,
|
||||||
|
ctx.Repo.Repository,
|
||||||
|
ctx.Repo.Permission)
|
||||||
|
} else {
|
||||||
|
log.Trace("Permission Denied: Not logged in")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.Error(http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if !comment.Type.HasContentSupport() {
|
||||||
|
ctx.Error(http.StatusNoContent)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
switch ctx.PathParam(":action") {
|
||||||
|
case "react":
|
||||||
|
reaction, err := issue_service.CreateCommentReaction(ctx, ctx.Doer, comment, form.Content)
|
||||||
|
if err != nil {
|
||||||
|
if issues_model.IsErrForbiddenIssueReaction(err) || errors.Is(err, user_model.ErrBlockedUser) {
|
||||||
|
ctx.ServerError("ChangeIssueReaction", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
log.Info("CreateCommentReaction: %s", err)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
// Reload new reactions
|
||||||
|
comment.Reactions = nil
|
||||||
|
if err = comment.LoadReactions(ctx, ctx.Repo.Repository); err != nil {
|
||||||
|
log.Info("comment.LoadReactions: %s", err)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Trace("Reaction for comment created: %d/%d/%d/%d", ctx.Repo.Repository.ID, comment.Issue.ID, comment.ID, reaction.ID)
|
||||||
|
case "unreact":
|
||||||
|
if err := issues_model.DeleteCommentReaction(ctx, ctx.Doer.ID, comment.Issue.ID, comment.ID, form.Content); err != nil {
|
||||||
|
ctx.ServerError("DeleteCommentReaction", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reload new reactions
|
||||||
|
comment.Reactions = nil
|
||||||
|
if err = comment.LoadReactions(ctx, ctx.Repo.Repository); err != nil {
|
||||||
|
log.Info("comment.LoadReactions: %s", err)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Trace("Reaction for comment removed: %d/%d/%d", ctx.Repo.Repository.ID, comment.Issue.ID, comment.ID)
|
||||||
|
default:
|
||||||
|
ctx.NotFound(fmt.Sprintf("Unknown action %s", ctx.PathParam(":action")), nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(comment.Reactions) == 0 {
|
||||||
|
ctx.JSON(http.StatusOK, map[string]any{
|
||||||
|
"empty": true,
|
||||||
|
"html": "",
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
html, err := ctx.RenderToHTML(tplReactions, map[string]any{
|
||||||
|
"ActionURL": fmt.Sprintf("%s/comments/%d/reactions", ctx.Repo.RepoLink, comment.ID),
|
||||||
|
"Reactions": comment.Reactions.GroupByType(),
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("ChangeCommentReaction.HTMLString", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.JSON(http.StatusOK, map[string]any{
|
||||||
|
"html": html,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetCommentAttachments returns attachments for the comment
|
||||||
|
func GetCommentAttachments(ctx *context.Context) {
|
||||||
|
comment, err := issues_model.GetCommentByID(ctx, ctx.PathParamInt64(":id"))
|
||||||
|
if err != nil {
|
||||||
|
ctx.NotFoundOrServerError("GetCommentByID", issues_model.IsErrCommentNotExist, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := comment.LoadIssue(ctx); err != nil {
|
||||||
|
ctx.NotFoundOrServerError("LoadIssue", issues_model.IsErrIssueNotExist, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if comment.Issue.RepoID != ctx.Repo.Repository.ID {
|
||||||
|
ctx.NotFound("CompareRepoID", issues_model.ErrCommentNotExist{})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if !ctx.Repo.Permission.CanReadIssuesOrPulls(comment.Issue.IsPull) {
|
||||||
|
ctx.NotFound("CanReadIssuesOrPulls", issues_model.ErrCommentNotExist{})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if !comment.Type.HasAttachmentSupport() {
|
||||||
|
ctx.ServerError("GetCommentAttachments", fmt.Errorf("comment type %v does not support attachments", comment.Type))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
attachments := make([]*api.Attachment, 0)
|
||||||
|
if err := comment.LoadAttachments(ctx); err != nil {
|
||||||
|
ctx.ServerError("LoadAttachments", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for i := 0; i < len(comment.Attachments); i++ {
|
||||||
|
attachments = append(attachments, convert.ToAttachment(ctx.Repo.Repository, comment.Attachments[i]))
|
||||||
|
}
|
||||||
|
ctx.JSON(http.StatusOK, attachments)
|
||||||
|
}
|
|
@ -53,11 +53,11 @@ func InitializeLabels(ctx *context.Context) {
|
||||||
ctx.Redirect(ctx.Repo.RepoLink + "/labels")
|
ctx.Redirect(ctx.Repo.RepoLink + "/labels")
|
||||||
}
|
}
|
||||||
|
|
||||||
// RetrieveLabels find all the labels of a repository and organization
|
// RetrieveLabelsForList find all the labels of a repository and organization, it is only used by "/labels" page to list all labels
|
||||||
func RetrieveLabels(ctx *context.Context) {
|
func RetrieveLabelsForList(ctx *context.Context) {
|
||||||
labels, err := issues_model.GetLabelsByRepoID(ctx, ctx.Repo.Repository.ID, ctx.FormString("sort"), db.ListOptions{})
|
labels, err := issues_model.GetLabelsByRepoID(ctx, ctx.Repo.Repository.ID, ctx.FormString("sort"), db.ListOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.ServerError("RetrieveLabels.GetLabels", err)
|
ctx.ServerError("RetrieveLabelsForList.GetLabels", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -62,7 +62,7 @@ func TestRetrieveLabels(t *testing.T) {
|
||||||
contexttest.LoadUser(t, ctx, 2)
|
contexttest.LoadUser(t, ctx, 2)
|
||||||
contexttest.LoadRepo(t, ctx, testCase.RepoID)
|
contexttest.LoadRepo(t, ctx, testCase.RepoID)
|
||||||
ctx.Req.Form.Set("sort", testCase.Sort)
|
ctx.Req.Form.Set("sort", testCase.Sort)
|
||||||
RetrieveLabels(ctx)
|
RetrieveLabelsForList(ctx)
|
||||||
assert.False(t, ctx.Written())
|
assert.False(t, ctx.Written())
|
||||||
labels, ok := ctx.Data["Labels"].([]*issues_model.Label)
|
labels, ok := ctx.Data["Labels"].([]*issues_model.Label)
|
||||||
assert.True(t, ok)
|
assert.True(t, ok)
|
||||||
|
|
882
routers/web/repo/issue_list.go
Normal file
882
routers/web/repo/issue_list.go
Normal file
|
@ -0,0 +1,882 @@
|
||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package repo
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"code.gitea.io/gitea/models/db"
|
||||||
|
git_model "code.gitea.io/gitea/models/git"
|
||||||
|
issues_model "code.gitea.io/gitea/models/issues"
|
||||||
|
"code.gitea.io/gitea/models/organization"
|
||||||
|
repo_model "code.gitea.io/gitea/models/repo"
|
||||||
|
"code.gitea.io/gitea/models/unit"
|
||||||
|
user_model "code.gitea.io/gitea/models/user"
|
||||||
|
"code.gitea.io/gitea/modules/base"
|
||||||
|
issue_indexer "code.gitea.io/gitea/modules/indexer/issues"
|
||||||
|
"code.gitea.io/gitea/modules/log"
|
||||||
|
"code.gitea.io/gitea/modules/optional"
|
||||||
|
"code.gitea.io/gitea/modules/setting"
|
||||||
|
"code.gitea.io/gitea/modules/util"
|
||||||
|
shared_user "code.gitea.io/gitea/routers/web/shared/user"
|
||||||
|
"code.gitea.io/gitea/services/context"
|
||||||
|
"code.gitea.io/gitea/services/convert"
|
||||||
|
issue_service "code.gitea.io/gitea/services/issue"
|
||||||
|
pull_service "code.gitea.io/gitea/services/pull"
|
||||||
|
)
|
||||||
|
|
||||||
|
func issueIDsFromSearch(ctx *context.Context, keyword string, opts *issues_model.IssuesOptions) ([]int64, error) {
|
||||||
|
ids, _, err := issue_indexer.SearchIssues(ctx, issue_indexer.ToSearchOptions(keyword, opts))
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("SearchIssues: %w", err)
|
||||||
|
}
|
||||||
|
return ids, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func retrieveProjectsForIssueList(ctx *context.Context, repo *repo_model.Repository) {
|
||||||
|
ctx.Data["OpenProjects"], ctx.Data["ClosedProjects"] = retrieveProjectsInternal(ctx, repo)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SearchIssues searches for issues across the repositories that the user has access to
|
||||||
|
func SearchIssues(ctx *context.Context) {
|
||||||
|
before, since, err := context.GetQueryBeforeSince(ctx.Base)
|
||||||
|
if err != nil {
|
||||||
|
ctx.Error(http.StatusUnprocessableEntity, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var isClosed optional.Option[bool]
|
||||||
|
switch ctx.FormString("state") {
|
||||||
|
case "closed":
|
||||||
|
isClosed = optional.Some(true)
|
||||||
|
case "all":
|
||||||
|
isClosed = optional.None[bool]()
|
||||||
|
default:
|
||||||
|
isClosed = optional.Some(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
repoIDs []int64
|
||||||
|
allPublic bool
|
||||||
|
)
|
||||||
|
{
|
||||||
|
// find repos user can access (for issue search)
|
||||||
|
opts := &repo_model.SearchRepoOptions{
|
||||||
|
Private: false,
|
||||||
|
AllPublic: true,
|
||||||
|
TopicOnly: false,
|
||||||
|
Collaborate: optional.None[bool](),
|
||||||
|
// This needs to be a column that is not nil in fixtures or
|
||||||
|
// MySQL will return different results when sorting by null in some cases
|
||||||
|
OrderBy: db.SearchOrderByAlphabetically,
|
||||||
|
Actor: ctx.Doer,
|
||||||
|
}
|
||||||
|
if ctx.IsSigned {
|
||||||
|
opts.Private = true
|
||||||
|
opts.AllLimited = true
|
||||||
|
}
|
||||||
|
if ctx.FormString("owner") != "" {
|
||||||
|
owner, err := user_model.GetUserByName(ctx, ctx.FormString("owner"))
|
||||||
|
if err != nil {
|
||||||
|
if user_model.IsErrUserNotExist(err) {
|
||||||
|
ctx.Error(http.StatusBadRequest, "Owner not found", err.Error())
|
||||||
|
} else {
|
||||||
|
ctx.Error(http.StatusInternalServerError, "GetUserByName", err.Error())
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
opts.OwnerID = owner.ID
|
||||||
|
opts.AllLimited = false
|
||||||
|
opts.AllPublic = false
|
||||||
|
opts.Collaborate = optional.Some(false)
|
||||||
|
}
|
||||||
|
if ctx.FormString("team") != "" {
|
||||||
|
if ctx.FormString("owner") == "" {
|
||||||
|
ctx.Error(http.StatusBadRequest, "", "Owner organisation is required for filtering on team")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
team, err := organization.GetTeam(ctx, opts.OwnerID, ctx.FormString("team"))
|
||||||
|
if err != nil {
|
||||||
|
if organization.IsErrTeamNotExist(err) {
|
||||||
|
ctx.Error(http.StatusBadRequest, "Team not found", err.Error())
|
||||||
|
} else {
|
||||||
|
ctx.Error(http.StatusInternalServerError, "GetUserByName", err.Error())
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
opts.TeamID = team.ID
|
||||||
|
}
|
||||||
|
|
||||||
|
if opts.AllPublic {
|
||||||
|
allPublic = true
|
||||||
|
opts.AllPublic = false // set it false to avoid returning too many repos, we could filter by indexer
|
||||||
|
}
|
||||||
|
repoIDs, _, err = repo_model.SearchRepositoryIDs(ctx, opts)
|
||||||
|
if err != nil {
|
||||||
|
ctx.Error(http.StatusInternalServerError, "SearchRepositoryIDs", err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if len(repoIDs) == 0 {
|
||||||
|
// no repos found, don't let the indexer return all repos
|
||||||
|
repoIDs = []int64{0}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
keyword := ctx.FormTrim("q")
|
||||||
|
if strings.IndexByte(keyword, 0) >= 0 {
|
||||||
|
keyword = ""
|
||||||
|
}
|
||||||
|
|
||||||
|
isPull := optional.None[bool]()
|
||||||
|
switch ctx.FormString("type") {
|
||||||
|
case "pulls":
|
||||||
|
isPull = optional.Some(true)
|
||||||
|
case "issues":
|
||||||
|
isPull = optional.Some(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
var includedAnyLabels []int64
|
||||||
|
{
|
||||||
|
labels := ctx.FormTrim("labels")
|
||||||
|
var includedLabelNames []string
|
||||||
|
if len(labels) > 0 {
|
||||||
|
includedLabelNames = strings.Split(labels, ",")
|
||||||
|
}
|
||||||
|
includedAnyLabels, err = issues_model.GetLabelIDsByNames(ctx, includedLabelNames)
|
||||||
|
if err != nil {
|
||||||
|
ctx.Error(http.StatusInternalServerError, "GetLabelIDsByNames", err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var includedMilestones []int64
|
||||||
|
{
|
||||||
|
milestones := ctx.FormTrim("milestones")
|
||||||
|
var includedMilestoneNames []string
|
||||||
|
if len(milestones) > 0 {
|
||||||
|
includedMilestoneNames = strings.Split(milestones, ",")
|
||||||
|
}
|
||||||
|
includedMilestones, err = issues_model.GetMilestoneIDsByNames(ctx, includedMilestoneNames)
|
||||||
|
if err != nil {
|
||||||
|
ctx.Error(http.StatusInternalServerError, "GetMilestoneIDsByNames", err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
projectID := optional.None[int64]()
|
||||||
|
if v := ctx.FormInt64("project"); v > 0 {
|
||||||
|
projectID = optional.Some(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
// this api is also used in UI,
|
||||||
|
// so the default limit is set to fit UI needs
|
||||||
|
limit := ctx.FormInt("limit")
|
||||||
|
if limit == 0 {
|
||||||
|
limit = setting.UI.IssuePagingNum
|
||||||
|
} else if limit > setting.API.MaxResponseItems {
|
||||||
|
limit = setting.API.MaxResponseItems
|
||||||
|
}
|
||||||
|
|
||||||
|
searchOpt := &issue_indexer.SearchOptions{
|
||||||
|
Paginator: &db.ListOptions{
|
||||||
|
Page: ctx.FormInt("page"),
|
||||||
|
PageSize: limit,
|
||||||
|
},
|
||||||
|
Keyword: keyword,
|
||||||
|
RepoIDs: repoIDs,
|
||||||
|
AllPublic: allPublic,
|
||||||
|
IsPull: isPull,
|
||||||
|
IsClosed: isClosed,
|
||||||
|
IncludedAnyLabelIDs: includedAnyLabels,
|
||||||
|
MilestoneIDs: includedMilestones,
|
||||||
|
ProjectID: projectID,
|
||||||
|
SortBy: issue_indexer.SortByCreatedDesc,
|
||||||
|
}
|
||||||
|
|
||||||
|
if since != 0 {
|
||||||
|
searchOpt.UpdatedAfterUnix = optional.Some(since)
|
||||||
|
}
|
||||||
|
if before != 0 {
|
||||||
|
searchOpt.UpdatedBeforeUnix = optional.Some(before)
|
||||||
|
}
|
||||||
|
|
||||||
|
if ctx.IsSigned {
|
||||||
|
ctxUserID := ctx.Doer.ID
|
||||||
|
if ctx.FormBool("created") {
|
||||||
|
searchOpt.PosterID = optional.Some(ctxUserID)
|
||||||
|
}
|
||||||
|
if ctx.FormBool("assigned") {
|
||||||
|
searchOpt.AssigneeID = optional.Some(ctxUserID)
|
||||||
|
}
|
||||||
|
if ctx.FormBool("mentioned") {
|
||||||
|
searchOpt.MentionID = optional.Some(ctxUserID)
|
||||||
|
}
|
||||||
|
if ctx.FormBool("review_requested") {
|
||||||
|
searchOpt.ReviewRequestedID = optional.Some(ctxUserID)
|
||||||
|
}
|
||||||
|
if ctx.FormBool("reviewed") {
|
||||||
|
searchOpt.ReviewedID = optional.Some(ctxUserID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// FIXME: It's unsupported to sort by priority repo when searching by indexer,
|
||||||
|
// it's indeed an regression, but I think it is worth to support filtering by indexer first.
|
||||||
|
_ = ctx.FormInt64("priority_repo_id")
|
||||||
|
|
||||||
|
ids, total, err := issue_indexer.SearchIssues(ctx, searchOpt)
|
||||||
|
if err != nil {
|
||||||
|
ctx.Error(http.StatusInternalServerError, "SearchIssues", err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
issues, err := issues_model.GetIssuesByIDs(ctx, ids, true)
|
||||||
|
if err != nil {
|
||||||
|
ctx.Error(http.StatusInternalServerError, "FindIssuesByIDs", err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.SetTotalCountHeader(total)
|
||||||
|
ctx.JSON(http.StatusOK, convert.ToIssueList(ctx, ctx.Doer, issues))
|
||||||
|
}
|
||||||
|
|
||||||
|
func getUserIDForFilter(ctx *context.Context, queryName string) int64 {
|
||||||
|
userName := ctx.FormString(queryName)
|
||||||
|
if len(userName) == 0 {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
user, err := user_model.GetUserByName(ctx, userName)
|
||||||
|
if user_model.IsErrUserNotExist(err) {
|
||||||
|
ctx.NotFound("", err)
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
ctx.Error(http.StatusInternalServerError, err.Error())
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
return user.ID
|
||||||
|
}
|
||||||
|
|
||||||
|
// ListIssues list the issues of a repository
|
||||||
|
func ListIssues(ctx *context.Context) {
|
||||||
|
before, since, err := context.GetQueryBeforeSince(ctx.Base)
|
||||||
|
if err != nil {
|
||||||
|
ctx.Error(http.StatusUnprocessableEntity, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var isClosed optional.Option[bool]
|
||||||
|
switch ctx.FormString("state") {
|
||||||
|
case "closed":
|
||||||
|
isClosed = optional.Some(true)
|
||||||
|
case "all":
|
||||||
|
isClosed = optional.None[bool]()
|
||||||
|
default:
|
||||||
|
isClosed = optional.Some(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
keyword := ctx.FormTrim("q")
|
||||||
|
if strings.IndexByte(keyword, 0) >= 0 {
|
||||||
|
keyword = ""
|
||||||
|
}
|
||||||
|
|
||||||
|
var labelIDs []int64
|
||||||
|
if splitted := strings.Split(ctx.FormString("labels"), ","); len(splitted) > 0 {
|
||||||
|
labelIDs, err = issues_model.GetLabelIDsInRepoByNames(ctx, ctx.Repo.Repository.ID, splitted)
|
||||||
|
if err != nil {
|
||||||
|
ctx.Error(http.StatusInternalServerError, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var mileIDs []int64
|
||||||
|
if part := strings.Split(ctx.FormString("milestones"), ","); len(part) > 0 {
|
||||||
|
for i := range part {
|
||||||
|
// uses names and fall back to ids
|
||||||
|
// non existent milestones are discarded
|
||||||
|
mile, err := issues_model.GetMilestoneByRepoIDANDName(ctx, ctx.Repo.Repository.ID, part[i])
|
||||||
|
if err == nil {
|
||||||
|
mileIDs = append(mileIDs, mile.ID)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if !issues_model.IsErrMilestoneNotExist(err) {
|
||||||
|
ctx.Error(http.StatusInternalServerError, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
id, err := strconv.ParseInt(part[i], 10, 64)
|
||||||
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
mile, err = issues_model.GetMilestoneByRepoID(ctx, ctx.Repo.Repository.ID, id)
|
||||||
|
if err == nil {
|
||||||
|
mileIDs = append(mileIDs, mile.ID)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if issues_model.IsErrMilestoneNotExist(err) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
ctx.Error(http.StatusInternalServerError, err.Error())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
projectID := optional.None[int64]()
|
||||||
|
if v := ctx.FormInt64("project"); v > 0 {
|
||||||
|
projectID = optional.Some(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
isPull := optional.None[bool]()
|
||||||
|
switch ctx.FormString("type") {
|
||||||
|
case "pulls":
|
||||||
|
isPull = optional.Some(true)
|
||||||
|
case "issues":
|
||||||
|
isPull = optional.Some(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FIXME: we should be more efficient here
|
||||||
|
createdByID := getUserIDForFilter(ctx, "created_by")
|
||||||
|
if ctx.Written() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
assignedByID := getUserIDForFilter(ctx, "assigned_by")
|
||||||
|
if ctx.Written() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
mentionedByID := getUserIDForFilter(ctx, "mentioned_by")
|
||||||
|
if ctx.Written() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
searchOpt := &issue_indexer.SearchOptions{
|
||||||
|
Paginator: &db.ListOptions{
|
||||||
|
Page: ctx.FormInt("page"),
|
||||||
|
PageSize: convert.ToCorrectPageSize(ctx.FormInt("limit")),
|
||||||
|
},
|
||||||
|
Keyword: keyword,
|
||||||
|
RepoIDs: []int64{ctx.Repo.Repository.ID},
|
||||||
|
IsPull: isPull,
|
||||||
|
IsClosed: isClosed,
|
||||||
|
ProjectID: projectID,
|
||||||
|
SortBy: issue_indexer.SortByCreatedDesc,
|
||||||
|
}
|
||||||
|
if since != 0 {
|
||||||
|
searchOpt.UpdatedAfterUnix = optional.Some(since)
|
||||||
|
}
|
||||||
|
if before != 0 {
|
||||||
|
searchOpt.UpdatedBeforeUnix = optional.Some(before)
|
||||||
|
}
|
||||||
|
if len(labelIDs) == 1 && labelIDs[0] == 0 {
|
||||||
|
searchOpt.NoLabelOnly = true
|
||||||
|
} else {
|
||||||
|
for _, labelID := range labelIDs {
|
||||||
|
if labelID > 0 {
|
||||||
|
searchOpt.IncludedLabelIDs = append(searchOpt.IncludedLabelIDs, labelID)
|
||||||
|
} else {
|
||||||
|
searchOpt.ExcludedLabelIDs = append(searchOpt.ExcludedLabelIDs, -labelID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(mileIDs) == 1 && mileIDs[0] == db.NoConditionID {
|
||||||
|
searchOpt.MilestoneIDs = []int64{0}
|
||||||
|
} else {
|
||||||
|
searchOpt.MilestoneIDs = mileIDs
|
||||||
|
}
|
||||||
|
|
||||||
|
if createdByID > 0 {
|
||||||
|
searchOpt.PosterID = optional.Some(createdByID)
|
||||||
|
}
|
||||||
|
if assignedByID > 0 {
|
||||||
|
searchOpt.AssigneeID = optional.Some(assignedByID)
|
||||||
|
}
|
||||||
|
if mentionedByID > 0 {
|
||||||
|
searchOpt.MentionID = optional.Some(mentionedByID)
|
||||||
|
}
|
||||||
|
|
||||||
|
ids, total, err := issue_indexer.SearchIssues(ctx, searchOpt)
|
||||||
|
if err != nil {
|
||||||
|
ctx.Error(http.StatusInternalServerError, "SearchIssues", err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
issues, err := issues_model.GetIssuesByIDs(ctx, ids, true)
|
||||||
|
if err != nil {
|
||||||
|
ctx.Error(http.StatusInternalServerError, "FindIssuesByIDs", err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.SetTotalCountHeader(total)
|
||||||
|
ctx.JSON(http.StatusOK, convert.ToIssueList(ctx, ctx.Doer, issues))
|
||||||
|
}
|
||||||
|
|
||||||
|
func BatchDeleteIssues(ctx *context.Context) {
|
||||||
|
issues := getActionIssues(ctx)
|
||||||
|
if ctx.Written() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for _, issue := range issues {
|
||||||
|
if err := issue_service.DeleteIssue(ctx, ctx.Doer, ctx.Repo.GitRepo, issue); err != nil {
|
||||||
|
ctx.ServerError("DeleteIssue", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ctx.JSONOK()
|
||||||
|
}
|
||||||
|
|
||||||
|
// UpdateIssueStatus change issue's status
|
||||||
|
func UpdateIssueStatus(ctx *context.Context) {
|
||||||
|
issues := getActionIssues(ctx)
|
||||||
|
if ctx.Written() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var isClosed bool
|
||||||
|
switch action := ctx.FormString("action"); action {
|
||||||
|
case "open":
|
||||||
|
isClosed = false
|
||||||
|
case "close":
|
||||||
|
isClosed = true
|
||||||
|
default:
|
||||||
|
log.Warn("Unrecognized action: %s", action)
|
||||||
|
}
|
||||||
|
|
||||||
|
if _, err := issues.LoadRepositories(ctx); err != nil {
|
||||||
|
ctx.ServerError("LoadRepositories", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := issues.LoadPullRequests(ctx); err != nil {
|
||||||
|
ctx.ServerError("LoadPullRequests", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, issue := range issues {
|
||||||
|
if issue.IsPull && issue.PullRequest.HasMerged {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if issue.IsClosed != isClosed {
|
||||||
|
if err := issue_service.ChangeStatus(ctx, issue, ctx.Doer, "", isClosed); err != nil {
|
||||||
|
if issues_model.IsErrDependenciesLeft(err) {
|
||||||
|
ctx.JSON(http.StatusPreconditionFailed, map[string]any{
|
||||||
|
"error": ctx.Tr("repo.issues.dependency.issue_batch_close_blocked", issue.Index),
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.ServerError("ChangeStatus", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ctx.JSONOK()
|
||||||
|
}
|
||||||
|
|
||||||
|
func renderMilestones(ctx *context.Context) {
|
||||||
|
// Get milestones
|
||||||
|
milestones, err := db.Find[issues_model.Milestone](ctx, issues_model.FindMilestoneOptions{
|
||||||
|
RepoID: ctx.Repo.Repository.ID,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetAllRepoMilestones", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
openMilestones, closedMilestones := issues_model.MilestoneList{}, issues_model.MilestoneList{}
|
||||||
|
for _, milestone := range milestones {
|
||||||
|
if milestone.IsClosed {
|
||||||
|
closedMilestones = append(closedMilestones, milestone)
|
||||||
|
} else {
|
||||||
|
openMilestones = append(openMilestones, milestone)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ctx.Data["OpenMilestones"] = openMilestones
|
||||||
|
ctx.Data["ClosedMilestones"] = closedMilestones
|
||||||
|
}
|
||||||
|
|
||||||
|
func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption optional.Option[bool]) {
|
||||||
|
var err error
|
||||||
|
viewType := ctx.FormString("type")
|
||||||
|
sortType := ctx.FormString("sort")
|
||||||
|
types := []string{"all", "your_repositories", "assigned", "created_by", "mentioned", "review_requested", "reviewed_by"}
|
||||||
|
if !util.SliceContainsString(types, viewType, true) {
|
||||||
|
viewType = "all"
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
assigneeID = ctx.FormInt64("assignee")
|
||||||
|
posterID = ctx.FormInt64("poster")
|
||||||
|
mentionedID int64
|
||||||
|
reviewRequestedID int64
|
||||||
|
reviewedID int64
|
||||||
|
)
|
||||||
|
|
||||||
|
if ctx.IsSigned {
|
||||||
|
switch viewType {
|
||||||
|
case "created_by":
|
||||||
|
posterID = ctx.Doer.ID
|
||||||
|
case "mentioned":
|
||||||
|
mentionedID = ctx.Doer.ID
|
||||||
|
case "assigned":
|
||||||
|
assigneeID = ctx.Doer.ID
|
||||||
|
case "review_requested":
|
||||||
|
reviewRequestedID = ctx.Doer.ID
|
||||||
|
case "reviewed_by":
|
||||||
|
reviewedID = ctx.Doer.ID
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
repo := ctx.Repo.Repository
|
||||||
|
var labelIDs []int64
|
||||||
|
// 1,-2 means including label 1 and excluding label 2
|
||||||
|
// 0 means issues with no label
|
||||||
|
// blank means labels will not be filtered for issues
|
||||||
|
selectLabels := ctx.FormString("labels")
|
||||||
|
if selectLabels == "" {
|
||||||
|
ctx.Data["AllLabels"] = true
|
||||||
|
} else if selectLabels == "0" {
|
||||||
|
ctx.Data["NoLabel"] = true
|
||||||
|
}
|
||||||
|
if len(selectLabels) > 0 {
|
||||||
|
labelIDs, err = base.StringsToInt64s(strings.Split(selectLabels, ","))
|
||||||
|
if err != nil {
|
||||||
|
ctx.Flash.Error(ctx.Tr("invalid_data", selectLabels), true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
keyword := strings.Trim(ctx.FormString("q"), " ")
|
||||||
|
if bytes.Contains([]byte(keyword), []byte{0x00}) {
|
||||||
|
keyword = ""
|
||||||
|
}
|
||||||
|
|
||||||
|
var mileIDs []int64
|
||||||
|
if milestoneID > 0 || milestoneID == db.NoConditionID { // -1 to get those issues which have no any milestone assigned
|
||||||
|
mileIDs = []int64{milestoneID}
|
||||||
|
}
|
||||||
|
|
||||||
|
var issueStats *issues_model.IssueStats
|
||||||
|
statsOpts := &issues_model.IssuesOptions{
|
||||||
|
RepoIDs: []int64{repo.ID},
|
||||||
|
LabelIDs: labelIDs,
|
||||||
|
MilestoneIDs: mileIDs,
|
||||||
|
ProjectID: projectID,
|
||||||
|
AssigneeID: assigneeID,
|
||||||
|
MentionedID: mentionedID,
|
||||||
|
PosterID: posterID,
|
||||||
|
ReviewRequestedID: reviewRequestedID,
|
||||||
|
ReviewedID: reviewedID,
|
||||||
|
IsPull: isPullOption,
|
||||||
|
IssueIDs: nil,
|
||||||
|
}
|
||||||
|
if keyword != "" {
|
||||||
|
allIssueIDs, err := issueIDsFromSearch(ctx, keyword, statsOpts)
|
||||||
|
if err != nil {
|
||||||
|
if issue_indexer.IsAvailable(ctx) {
|
||||||
|
ctx.ServerError("issueIDsFromSearch", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.Data["IssueIndexerUnavailable"] = true
|
||||||
|
return
|
||||||
|
}
|
||||||
|
statsOpts.IssueIDs = allIssueIDs
|
||||||
|
}
|
||||||
|
if keyword != "" && len(statsOpts.IssueIDs) == 0 {
|
||||||
|
// So it did search with the keyword, but no issue found.
|
||||||
|
// Just set issueStats to empty.
|
||||||
|
issueStats = &issues_model.IssueStats{}
|
||||||
|
} else {
|
||||||
|
// So it did search with the keyword, and found some issues. It needs to get issueStats of these issues.
|
||||||
|
// Or the keyword is empty, so it doesn't need issueIDs as filter, just get issueStats with statsOpts.
|
||||||
|
issueStats, err = issues_model.GetIssueStats(ctx, statsOpts)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetIssueStats", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var isShowClosed optional.Option[bool]
|
||||||
|
switch ctx.FormString("state") {
|
||||||
|
case "closed":
|
||||||
|
isShowClosed = optional.Some(true)
|
||||||
|
case "all":
|
||||||
|
isShowClosed = optional.None[bool]()
|
||||||
|
default:
|
||||||
|
isShowClosed = optional.Some(false)
|
||||||
|
}
|
||||||
|
// if there are closed issues and no open issues, default to showing all issues
|
||||||
|
if len(ctx.FormString("state")) == 0 && issueStats.OpenCount == 0 && issueStats.ClosedCount != 0 {
|
||||||
|
isShowClosed = optional.None[bool]()
|
||||||
|
}
|
||||||
|
|
||||||
|
if repo.IsTimetrackerEnabled(ctx) {
|
||||||
|
totalTrackedTime, err := issues_model.GetIssueTotalTrackedTime(ctx, statsOpts, isShowClosed)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetIssueTotalTrackedTime", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.Data["TotalTrackedTime"] = totalTrackedTime
|
||||||
|
}
|
||||||
|
|
||||||
|
archived := ctx.FormBool("archived")
|
||||||
|
|
||||||
|
page := ctx.FormInt("page")
|
||||||
|
if page <= 1 {
|
||||||
|
page = 1
|
||||||
|
}
|
||||||
|
|
||||||
|
var total int
|
||||||
|
switch {
|
||||||
|
case isShowClosed.Value():
|
||||||
|
total = int(issueStats.ClosedCount)
|
||||||
|
case !isShowClosed.Has():
|
||||||
|
total = int(issueStats.OpenCount + issueStats.ClosedCount)
|
||||||
|
default:
|
||||||
|
total = int(issueStats.OpenCount)
|
||||||
|
}
|
||||||
|
pager := context.NewPagination(total, setting.UI.IssuePagingNum, page, 5)
|
||||||
|
|
||||||
|
var issues issues_model.IssueList
|
||||||
|
{
|
||||||
|
ids, err := issueIDsFromSearch(ctx, keyword, &issues_model.IssuesOptions{
|
||||||
|
Paginator: &db.ListOptions{
|
||||||
|
Page: pager.Paginater.Current(),
|
||||||
|
PageSize: setting.UI.IssuePagingNum,
|
||||||
|
},
|
||||||
|
RepoIDs: []int64{repo.ID},
|
||||||
|
AssigneeID: assigneeID,
|
||||||
|
PosterID: posterID,
|
||||||
|
MentionedID: mentionedID,
|
||||||
|
ReviewRequestedID: reviewRequestedID,
|
||||||
|
ReviewedID: reviewedID,
|
||||||
|
MilestoneIDs: mileIDs,
|
||||||
|
ProjectID: projectID,
|
||||||
|
IsClosed: isShowClosed,
|
||||||
|
IsPull: isPullOption,
|
||||||
|
LabelIDs: labelIDs,
|
||||||
|
SortType: sortType,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
if issue_indexer.IsAvailable(ctx) {
|
||||||
|
ctx.ServerError("issueIDsFromSearch", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.Data["IssueIndexerUnavailable"] = true
|
||||||
|
return
|
||||||
|
}
|
||||||
|
issues, err = issues_model.GetIssuesByIDs(ctx, ids, true)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetIssuesByIDs", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
approvalCounts, err := issues.GetApprovalCounts(ctx)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("ApprovalCounts", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if ctx.IsSigned {
|
||||||
|
if err := issues.LoadIsRead(ctx, ctx.Doer.ID); err != nil {
|
||||||
|
ctx.ServerError("LoadIsRead", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
for i := range issues {
|
||||||
|
issues[i].IsRead = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
commitStatuses, lastStatus, err := pull_service.GetIssuesAllCommitStatus(ctx, issues)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetIssuesAllCommitStatus", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !ctx.Repo.CanRead(unit.TypeActions) {
|
||||||
|
for key := range commitStatuses {
|
||||||
|
git_model.CommitStatusesHideActionsURL(ctx, commitStatuses[key])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := issues.LoadAttributes(ctx); err != nil {
|
||||||
|
ctx.ServerError("issues.LoadAttributes", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.Data["Issues"] = issues
|
||||||
|
ctx.Data["CommitLastStatus"] = lastStatus
|
||||||
|
ctx.Data["CommitStatuses"] = commitStatuses
|
||||||
|
|
||||||
|
// Get assignees.
|
||||||
|
assigneeUsers, err := repo_model.GetRepoAssignees(ctx, repo)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetRepoAssignees", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.Data["Assignees"] = shared_user.MakeSelfOnTop(ctx.Doer, assigneeUsers)
|
||||||
|
|
||||||
|
handleTeamMentions(ctx)
|
||||||
|
if ctx.Written() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
labels, err := issues_model.GetLabelsByRepoID(ctx, repo.ID, "", db.ListOptions{})
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetLabelsByRepoID", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if repo.Owner.IsOrganization() {
|
||||||
|
orgLabels, err := issues_model.GetLabelsByOrgID(ctx, repo.Owner.ID, ctx.FormString("sort"), db.ListOptions{})
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetLabelsByOrgID", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.Data["OrgLabels"] = orgLabels
|
||||||
|
labels = append(labels, orgLabels...)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get the exclusive scope for every label ID
|
||||||
|
labelExclusiveScopes := make([]string, 0, len(labelIDs))
|
||||||
|
for _, labelID := range labelIDs {
|
||||||
|
foundExclusiveScope := false
|
||||||
|
for _, label := range labels {
|
||||||
|
if label.ID == labelID || label.ID == -labelID {
|
||||||
|
labelExclusiveScopes = append(labelExclusiveScopes, label.ExclusiveScope())
|
||||||
|
foundExclusiveScope = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !foundExclusiveScope {
|
||||||
|
labelExclusiveScopes = append(labelExclusiveScopes, "")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, l := range labels {
|
||||||
|
l.LoadSelectedLabelsAfterClick(labelIDs, labelExclusiveScopes)
|
||||||
|
}
|
||||||
|
ctx.Data["Labels"] = labels
|
||||||
|
ctx.Data["NumLabels"] = len(labels)
|
||||||
|
|
||||||
|
if ctx.FormInt64("assignee") == 0 {
|
||||||
|
assigneeID = 0 // Reset ID to prevent unexpected selection of assignee.
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.Data["IssueRefEndNames"], ctx.Data["IssueRefURLs"] = issue_service.GetRefEndNamesAndURLs(issues, ctx.Repo.RepoLink)
|
||||||
|
|
||||||
|
ctx.Data["ApprovalCounts"] = func(issueID int64, typ string) int64 {
|
||||||
|
counts, ok := approvalCounts[issueID]
|
||||||
|
if !ok || len(counts) == 0 {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
reviewTyp := issues_model.ReviewTypeApprove
|
||||||
|
if typ == "reject" {
|
||||||
|
reviewTyp = issues_model.ReviewTypeReject
|
||||||
|
} else if typ == "waiting" {
|
||||||
|
reviewTyp = issues_model.ReviewTypeRequest
|
||||||
|
}
|
||||||
|
for _, count := range counts {
|
||||||
|
if count.Type == reviewTyp {
|
||||||
|
return count.Count
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
retrieveProjectsForIssueList(ctx, repo)
|
||||||
|
if ctx.Written() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
pinned, err := issues_model.GetPinnedIssues(ctx, repo.ID, isPullOption.Value())
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetPinnedIssues", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.Data["PinnedIssues"] = pinned
|
||||||
|
ctx.Data["IsRepoAdmin"] = ctx.IsSigned && (ctx.Repo.IsAdmin() || ctx.Doer.IsAdmin)
|
||||||
|
ctx.Data["IssueStats"] = issueStats
|
||||||
|
ctx.Data["OpenCount"] = issueStats.OpenCount
|
||||||
|
ctx.Data["ClosedCount"] = issueStats.ClosedCount
|
||||||
|
linkStr := "%s?q=%s&type=%s&sort=%s&state=%s&labels=%s&milestone=%d&project=%d&assignee=%d&poster=%d&archived=%t"
|
||||||
|
ctx.Data["AllStatesLink"] = fmt.Sprintf(linkStr, ctx.Link,
|
||||||
|
url.QueryEscape(keyword), url.QueryEscape(viewType), url.QueryEscape(sortType), "all", url.QueryEscape(selectLabels),
|
||||||
|
milestoneID, projectID, assigneeID, posterID, archived)
|
||||||
|
ctx.Data["OpenLink"] = fmt.Sprintf(linkStr, ctx.Link,
|
||||||
|
url.QueryEscape(keyword), url.QueryEscape(viewType), url.QueryEscape(sortType), "open", url.QueryEscape(selectLabels),
|
||||||
|
milestoneID, projectID, assigneeID, posterID, archived)
|
||||||
|
ctx.Data["ClosedLink"] = fmt.Sprintf(linkStr, ctx.Link,
|
||||||
|
url.QueryEscape(keyword), url.QueryEscape(viewType), url.QueryEscape(sortType), "closed", url.QueryEscape(selectLabels),
|
||||||
|
milestoneID, projectID, assigneeID, posterID, archived)
|
||||||
|
ctx.Data["SelLabelIDs"] = labelIDs
|
||||||
|
ctx.Data["SelectLabels"] = selectLabels
|
||||||
|
ctx.Data["ViewType"] = viewType
|
||||||
|
ctx.Data["SortType"] = sortType
|
||||||
|
ctx.Data["MilestoneID"] = milestoneID
|
||||||
|
ctx.Data["ProjectID"] = projectID
|
||||||
|
ctx.Data["AssigneeID"] = assigneeID
|
||||||
|
ctx.Data["PosterID"] = posterID
|
||||||
|
ctx.Data["Keyword"] = keyword
|
||||||
|
ctx.Data["IsShowClosed"] = isShowClosed
|
||||||
|
switch {
|
||||||
|
case isShowClosed.Value():
|
||||||
|
ctx.Data["State"] = "closed"
|
||||||
|
case !isShowClosed.Has():
|
||||||
|
ctx.Data["State"] = "all"
|
||||||
|
default:
|
||||||
|
ctx.Data["State"] = "open"
|
||||||
|
}
|
||||||
|
ctx.Data["ShowArchivedLabels"] = archived
|
||||||
|
|
||||||
|
pager.AddParamString("q", keyword)
|
||||||
|
pager.AddParamString("type", viewType)
|
||||||
|
pager.AddParamString("sort", sortType)
|
||||||
|
pager.AddParamString("state", fmt.Sprint(ctx.Data["State"]))
|
||||||
|
pager.AddParamString("labels", fmt.Sprint(selectLabels))
|
||||||
|
pager.AddParamString("milestone", fmt.Sprint(milestoneID))
|
||||||
|
pager.AddParamString("project", fmt.Sprint(projectID))
|
||||||
|
pager.AddParamString("assignee", fmt.Sprint(assigneeID))
|
||||||
|
pager.AddParamString("poster", fmt.Sprint(posterID))
|
||||||
|
pager.AddParamString("archived", fmt.Sprint(archived))
|
||||||
|
|
||||||
|
ctx.Data["Page"] = pager
|
||||||
|
}
|
||||||
|
|
||||||
|
// Issues render issues page
|
||||||
|
func Issues(ctx *context.Context) {
|
||||||
|
isPullList := ctx.PathParam(":type") == "pulls"
|
||||||
|
if isPullList {
|
||||||
|
MustAllowPulls(ctx)
|
||||||
|
if ctx.Written() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.Data["Title"] = ctx.Tr("repo.pulls")
|
||||||
|
ctx.Data["PageIsPullList"] = true
|
||||||
|
} else {
|
||||||
|
MustEnableIssues(ctx)
|
||||||
|
if ctx.Written() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.Data["Title"] = ctx.Tr("repo.issues")
|
||||||
|
ctx.Data["PageIsIssueList"] = true
|
||||||
|
ctx.Data["NewIssueChooseTemplate"] = issue_service.HasTemplatesOrContactLinks(ctx.Repo.Repository, ctx.Repo.GitRepo)
|
||||||
|
}
|
||||||
|
|
||||||
|
issues(ctx, ctx.FormInt64("milestone"), ctx.FormInt64("project"), optional.Some(isPullList))
|
||||||
|
if ctx.Written() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
renderMilestones(ctx)
|
||||||
|
if ctx.Written() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.Data["CanWriteIssuesOrPulls"] = ctx.Repo.CanWriteIssuesOrPulls(isPullList)
|
||||||
|
|
||||||
|
ctx.HTML(http.StatusOK, tplIssues)
|
||||||
|
}
|
403
routers/web/repo/issue_new.go
Normal file
403
routers/web/repo/issue_new.go
Normal file
|
@ -0,0 +1,403 @@
|
||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package repo
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"html/template"
|
||||||
|
"net/http"
|
||||||
|
"slices"
|
||||||
|
"sort"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
issues_model "code.gitea.io/gitea/models/issues"
|
||||||
|
"code.gitea.io/gitea/models/organization"
|
||||||
|
project_model "code.gitea.io/gitea/models/project"
|
||||||
|
repo_model "code.gitea.io/gitea/models/repo"
|
||||||
|
"code.gitea.io/gitea/models/unit"
|
||||||
|
user_model "code.gitea.io/gitea/models/user"
|
||||||
|
"code.gitea.io/gitea/modules/base"
|
||||||
|
"code.gitea.io/gitea/modules/container"
|
||||||
|
"code.gitea.io/gitea/modules/git"
|
||||||
|
issue_template "code.gitea.io/gitea/modules/issue/template"
|
||||||
|
"code.gitea.io/gitea/modules/log"
|
||||||
|
"code.gitea.io/gitea/modules/setting"
|
||||||
|
api "code.gitea.io/gitea/modules/structs"
|
||||||
|
"code.gitea.io/gitea/modules/util"
|
||||||
|
"code.gitea.io/gitea/modules/web"
|
||||||
|
"code.gitea.io/gitea/routers/utils"
|
||||||
|
"code.gitea.io/gitea/services/context"
|
||||||
|
"code.gitea.io/gitea/services/context/upload"
|
||||||
|
"code.gitea.io/gitea/services/forms"
|
||||||
|
issue_service "code.gitea.io/gitea/services/issue"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Tries to load and set an issue template. The first return value indicates if a template was loaded.
|
||||||
|
func setTemplateIfExists(ctx *context.Context, ctxDataKey string, possibleFiles []string, metaData *IssuePageMetaData) (bool, map[string]error) {
|
||||||
|
commit, err := ctx.Repo.GitRepo.GetBranchCommit(ctx.Repo.Repository.DefaultBranch)
|
||||||
|
if err != nil {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
templateCandidates := make([]string, 0, 1+len(possibleFiles))
|
||||||
|
if t := ctx.FormString("template"); t != "" {
|
||||||
|
templateCandidates = append(templateCandidates, t)
|
||||||
|
}
|
||||||
|
templateCandidates = append(templateCandidates, possibleFiles...) // Append files to the end because they should be fallback
|
||||||
|
|
||||||
|
templateErrs := map[string]error{}
|
||||||
|
for _, filename := range templateCandidates {
|
||||||
|
if ok, _ := commit.HasFile(filename); !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
template, err := issue_template.UnmarshalFromCommit(commit, filename)
|
||||||
|
if err != nil {
|
||||||
|
templateErrs[filename] = err
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
ctx.Data[issueTemplateTitleKey] = template.Title
|
||||||
|
ctx.Data[ctxDataKey] = template.Content
|
||||||
|
|
||||||
|
if template.Type() == api.IssueTemplateTypeYaml {
|
||||||
|
// Replace field default values by values from query
|
||||||
|
for _, field := range template.Fields {
|
||||||
|
fieldValue := ctx.FormString("field:" + field.ID)
|
||||||
|
if fieldValue != "" {
|
||||||
|
field.Attributes["value"] = fieldValue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.Data["Fields"] = template.Fields
|
||||||
|
ctx.Data["TemplateFile"] = template.FileName
|
||||||
|
}
|
||||||
|
|
||||||
|
metaData.LabelsData.SetSelectedLabelNames(template.Labels)
|
||||||
|
|
||||||
|
selectedAssigneeIDStrings := make([]string, 0, len(template.Assignees))
|
||||||
|
if userIDs, err := user_model.GetUserIDsByNames(ctx, template.Assignees, true); err == nil {
|
||||||
|
for _, userID := range userIDs {
|
||||||
|
selectedAssigneeIDStrings = append(selectedAssigneeIDStrings, strconv.FormatInt(userID, 10))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
metaData.AssigneesData.SelectedAssigneeIDs = strings.Join(selectedAssigneeIDStrings, ",")
|
||||||
|
|
||||||
|
if template.Ref != "" && !strings.HasPrefix(template.Ref, "refs/") { // Assume that the ref intended is always a branch - for tags users should use refs/tags/<ref>
|
||||||
|
template.Ref = git.BranchPrefix + template.Ref
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.Data["Reference"] = template.Ref
|
||||||
|
ctx.Data["RefEndName"] = git.RefName(template.Ref).ShortName()
|
||||||
|
return true, templateErrs
|
||||||
|
}
|
||||||
|
return false, templateErrs
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewIssue render creating issue page
|
||||||
|
func NewIssue(ctx *context.Context) {
|
||||||
|
issueConfig, _ := issue_service.GetTemplateConfigFromDefaultBranch(ctx.Repo.Repository, ctx.Repo.GitRepo)
|
||||||
|
hasTemplates := issue_service.HasTemplatesOrContactLinks(ctx.Repo.Repository, ctx.Repo.GitRepo)
|
||||||
|
|
||||||
|
ctx.Data["Title"] = ctx.Tr("repo.issues.new")
|
||||||
|
ctx.Data["PageIsIssueList"] = true
|
||||||
|
ctx.Data["NewIssueChooseTemplate"] = hasTemplates
|
||||||
|
ctx.Data["PullRequestWorkInProgressPrefixes"] = setting.Repository.PullRequest.WorkInProgressPrefixes
|
||||||
|
title := ctx.FormString("title")
|
||||||
|
ctx.Data["TitleQuery"] = title
|
||||||
|
body := ctx.FormString("body")
|
||||||
|
ctx.Data["BodyQuery"] = body
|
||||||
|
|
||||||
|
isProjectsEnabled := ctx.Repo.CanRead(unit.TypeProjects)
|
||||||
|
ctx.Data["IsProjectsEnabled"] = isProjectsEnabled
|
||||||
|
ctx.Data["IsAttachmentEnabled"] = setting.Attachment.Enabled
|
||||||
|
upload.AddUploadContext(ctx, "comment")
|
||||||
|
|
||||||
|
pageMetaData := retrieveRepoIssueMetaData(ctx, ctx.Repo.Repository, nil, false)
|
||||||
|
if ctx.Written() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
pageMetaData.MilestonesData.SelectedMilestoneID = ctx.FormInt64("milestone")
|
||||||
|
pageMetaData.ProjectsData.SelectedProjectID = ctx.FormInt64("project")
|
||||||
|
if pageMetaData.ProjectsData.SelectedProjectID > 0 {
|
||||||
|
if len(ctx.Req.URL.Query().Get("project")) > 0 {
|
||||||
|
ctx.Data["redirect_after_creation"] = "project"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tags, err := repo_model.GetTagNamesByRepoID(ctx, ctx.Repo.Repository.ID)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetTagNamesByRepoID", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.Data["Tags"] = tags
|
||||||
|
|
||||||
|
ret := issue_service.ParseTemplatesFromDefaultBranch(ctx.Repo.Repository, ctx.Repo.GitRepo)
|
||||||
|
templateLoaded, errs := setTemplateIfExists(ctx, issueTemplateKey, IssueTemplateCandidates, pageMetaData)
|
||||||
|
for k, v := range errs {
|
||||||
|
ret.TemplateErrors[k] = v
|
||||||
|
}
|
||||||
|
if ctx.Written() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(ret.TemplateErrors) > 0 {
|
||||||
|
ctx.Flash.Warning(renderErrorOfTemplates(ctx, ret.TemplateErrors), true)
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.Data["HasIssuesOrPullsWritePermission"] = ctx.Repo.CanWrite(unit.TypeIssues)
|
||||||
|
|
||||||
|
if !issueConfig.BlankIssuesEnabled && hasTemplates && !templateLoaded {
|
||||||
|
// The "issues/new" and "issues/new/choose" share the same query parameters "project" and "milestone", if blank issues are disabled, just redirect to the "issues/choose" page with these parameters.
|
||||||
|
ctx.Redirect(fmt.Sprintf("%s/issues/new/choose?%s", ctx.Repo.Repository.Link(), ctx.Req.URL.RawQuery), http.StatusSeeOther)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.HTML(http.StatusOK, tplIssueNew)
|
||||||
|
}
|
||||||
|
|
||||||
|
func renderErrorOfTemplates(ctx *context.Context, errs map[string]error) template.HTML {
|
||||||
|
var files []string
|
||||||
|
for k := range errs {
|
||||||
|
files = append(files, k)
|
||||||
|
}
|
||||||
|
sort.Strings(files) // keep the output stable
|
||||||
|
|
||||||
|
var lines []string
|
||||||
|
for _, file := range files {
|
||||||
|
lines = append(lines, fmt.Sprintf("%s: %v", file, errs[file]))
|
||||||
|
}
|
||||||
|
|
||||||
|
flashError, err := ctx.RenderToHTML(tplAlertDetails, map[string]any{
|
||||||
|
"Message": ctx.Tr("repo.issues.choose.ignore_invalid_templates"),
|
||||||
|
"Summary": ctx.Tr("repo.issues.choose.invalid_templates", len(errs)),
|
||||||
|
"Details": utils.SanitizeFlashErrorString(strings.Join(lines, "\n")),
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
log.Debug("render flash error: %v", err)
|
||||||
|
flashError = ctx.Locale.Tr("repo.issues.choose.ignore_invalid_templates")
|
||||||
|
}
|
||||||
|
return flashError
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewIssueChooseTemplate render creating issue from template page
|
||||||
|
func NewIssueChooseTemplate(ctx *context.Context) {
|
||||||
|
ctx.Data["Title"] = ctx.Tr("repo.issues.new")
|
||||||
|
ctx.Data["PageIsIssueList"] = true
|
||||||
|
|
||||||
|
ret := issue_service.ParseTemplatesFromDefaultBranch(ctx.Repo.Repository, ctx.Repo.GitRepo)
|
||||||
|
ctx.Data["IssueTemplates"] = ret.IssueTemplates
|
||||||
|
|
||||||
|
if len(ret.TemplateErrors) > 0 {
|
||||||
|
ctx.Flash.Warning(renderErrorOfTemplates(ctx, ret.TemplateErrors), true)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !issue_service.HasTemplatesOrContactLinks(ctx.Repo.Repository, ctx.Repo.GitRepo) {
|
||||||
|
// The "issues/new" and "issues/new/choose" share the same query parameters "project" and "milestone", if no template here, just redirect to the "issues/new" page with these parameters.
|
||||||
|
ctx.Redirect(fmt.Sprintf("%s/issues/new?%s", ctx.Repo.Repository.Link(), ctx.Req.URL.RawQuery), http.StatusSeeOther)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
issueConfig, err := issue_service.GetTemplateConfigFromDefaultBranch(ctx.Repo.Repository, ctx.Repo.GitRepo)
|
||||||
|
ctx.Data["IssueConfig"] = issueConfig
|
||||||
|
ctx.Data["IssueConfigError"] = err // ctx.Flash.Err makes problems here
|
||||||
|
|
||||||
|
ctx.Data["milestone"] = ctx.FormInt64("milestone")
|
||||||
|
ctx.Data["project"] = ctx.FormInt64("project")
|
||||||
|
|
||||||
|
ctx.HTML(http.StatusOK, tplIssueChoose)
|
||||||
|
}
|
||||||
|
|
||||||
|
// DeleteIssue deletes an issue
|
||||||
|
func DeleteIssue(ctx *context.Context) {
|
||||||
|
issue := GetActionIssue(ctx)
|
||||||
|
if ctx.Written() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := issue_service.DeleteIssue(ctx, ctx.Doer, ctx.Repo.GitRepo, issue); err != nil {
|
||||||
|
ctx.ServerError("DeleteIssueByID", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if issue.IsPull {
|
||||||
|
ctx.Redirect(fmt.Sprintf("%s/pulls", ctx.Repo.Repository.Link()), http.StatusSeeOther)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.Redirect(fmt.Sprintf("%s/issues", ctx.Repo.Repository.Link()), http.StatusSeeOther)
|
||||||
|
}
|
||||||
|
|
||||||
|
func toSet[ItemType any, KeyType comparable](slice []ItemType, keyFunc func(ItemType) KeyType) container.Set[KeyType] {
|
||||||
|
s := make(container.Set[KeyType])
|
||||||
|
for _, item := range slice {
|
||||||
|
s.Add(keyFunc(item))
|
||||||
|
}
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
|
||||||
|
// ValidateRepoMetasForNewIssue check and returns repository's meta information
|
||||||
|
func ValidateRepoMetasForNewIssue(ctx *context.Context, form forms.CreateIssueForm, isPull bool) (ret struct {
|
||||||
|
LabelIDs, AssigneeIDs []int64
|
||||||
|
MilestoneID, ProjectID int64
|
||||||
|
|
||||||
|
Reviewers []*user_model.User
|
||||||
|
TeamReviewers []*organization.Team
|
||||||
|
},
|
||||||
|
) {
|
||||||
|
pageMetaData := retrieveRepoIssueMetaData(ctx, ctx.Repo.Repository, nil, isPull)
|
||||||
|
if ctx.Written() {
|
||||||
|
return ret
|
||||||
|
}
|
||||||
|
|
||||||
|
inputLabelIDs, _ := base.StringsToInt64s(strings.Split(form.LabelIDs, ","))
|
||||||
|
candidateLabels := toSet(pageMetaData.LabelsData.AllLabels, func(label *issues_model.Label) int64 { return label.ID })
|
||||||
|
if len(inputLabelIDs) > 0 && !candidateLabels.Contains(inputLabelIDs...) {
|
||||||
|
ctx.NotFound("", nil)
|
||||||
|
return ret
|
||||||
|
}
|
||||||
|
pageMetaData.LabelsData.SetSelectedLabelIDs(inputLabelIDs)
|
||||||
|
|
||||||
|
allMilestones := append(slices.Clone(pageMetaData.MilestonesData.OpenMilestones), pageMetaData.MilestonesData.ClosedMilestones...)
|
||||||
|
candidateMilestones := toSet(allMilestones, func(milestone *issues_model.Milestone) int64 { return milestone.ID })
|
||||||
|
if form.MilestoneID > 0 && !candidateMilestones.Contains(form.MilestoneID) {
|
||||||
|
ctx.NotFound("", nil)
|
||||||
|
return ret
|
||||||
|
}
|
||||||
|
pageMetaData.MilestonesData.SelectedMilestoneID = form.MilestoneID
|
||||||
|
|
||||||
|
allProjects := append(slices.Clone(pageMetaData.ProjectsData.OpenProjects), pageMetaData.ProjectsData.ClosedProjects...)
|
||||||
|
candidateProjects := toSet(allProjects, func(project *project_model.Project) int64 { return project.ID })
|
||||||
|
if form.ProjectID > 0 && !candidateProjects.Contains(form.ProjectID) {
|
||||||
|
ctx.NotFound("", nil)
|
||||||
|
return ret
|
||||||
|
}
|
||||||
|
pageMetaData.ProjectsData.SelectedProjectID = form.ProjectID
|
||||||
|
|
||||||
|
candidateAssignees := toSet(pageMetaData.AssigneesData.CandidateAssignees, func(user *user_model.User) int64 { return user.ID })
|
||||||
|
inputAssigneeIDs, _ := base.StringsToInt64s(strings.Split(form.AssigneeIDs, ","))
|
||||||
|
if len(inputAssigneeIDs) > 0 && !candidateAssignees.Contains(inputAssigneeIDs...) {
|
||||||
|
ctx.NotFound("", nil)
|
||||||
|
return ret
|
||||||
|
}
|
||||||
|
pageMetaData.AssigneesData.SelectedAssigneeIDs = form.AssigneeIDs
|
||||||
|
|
||||||
|
// Check if the passed reviewers (user/team) actually exist
|
||||||
|
var reviewers []*user_model.User
|
||||||
|
var teamReviewers []*organization.Team
|
||||||
|
reviewerIDs, _ := base.StringsToInt64s(strings.Split(form.ReviewerIDs, ","))
|
||||||
|
if isPull && len(reviewerIDs) > 0 {
|
||||||
|
userReviewersMap := map[int64]*user_model.User{}
|
||||||
|
teamReviewersMap := map[int64]*organization.Team{}
|
||||||
|
for _, r := range pageMetaData.ReviewersData.Reviewers {
|
||||||
|
userReviewersMap[r.User.ID] = r.User
|
||||||
|
}
|
||||||
|
for _, r := range pageMetaData.ReviewersData.TeamReviewers {
|
||||||
|
teamReviewersMap[r.Team.ID] = r.Team
|
||||||
|
}
|
||||||
|
for _, rID := range reviewerIDs {
|
||||||
|
if rID < 0 { // negative reviewIDs represent team requests
|
||||||
|
team, ok := teamReviewersMap[-rID]
|
||||||
|
if !ok {
|
||||||
|
ctx.NotFound("", nil)
|
||||||
|
return ret
|
||||||
|
}
|
||||||
|
teamReviewers = append(teamReviewers, team)
|
||||||
|
} else {
|
||||||
|
user, ok := userReviewersMap[rID]
|
||||||
|
if !ok {
|
||||||
|
ctx.NotFound("", nil)
|
||||||
|
return ret
|
||||||
|
}
|
||||||
|
reviewers = append(reviewers, user)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ret.LabelIDs, ret.AssigneeIDs, ret.MilestoneID, ret.ProjectID = inputLabelIDs, inputAssigneeIDs, form.MilestoneID, form.ProjectID
|
||||||
|
ret.Reviewers, ret.TeamReviewers = reviewers, teamReviewers
|
||||||
|
return ret
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewIssuePost response for creating new issue
|
||||||
|
func NewIssuePost(ctx *context.Context) {
|
||||||
|
form := web.GetForm(ctx).(*forms.CreateIssueForm)
|
||||||
|
ctx.Data["Title"] = ctx.Tr("repo.issues.new")
|
||||||
|
ctx.Data["PageIsIssueList"] = true
|
||||||
|
ctx.Data["NewIssueChooseTemplate"] = issue_service.HasTemplatesOrContactLinks(ctx.Repo.Repository, ctx.Repo.GitRepo)
|
||||||
|
ctx.Data["PullRequestWorkInProgressPrefixes"] = setting.Repository.PullRequest.WorkInProgressPrefixes
|
||||||
|
ctx.Data["IsAttachmentEnabled"] = setting.Attachment.Enabled
|
||||||
|
upload.AddUploadContext(ctx, "comment")
|
||||||
|
|
||||||
|
var (
|
||||||
|
repo = ctx.Repo.Repository
|
||||||
|
attachments []string
|
||||||
|
)
|
||||||
|
|
||||||
|
validateRet := ValidateRepoMetasForNewIssue(ctx, *form, false)
|
||||||
|
if ctx.Written() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
labelIDs, assigneeIDs, milestoneID, projectID := validateRet.LabelIDs, validateRet.AssigneeIDs, validateRet.MilestoneID, validateRet.ProjectID
|
||||||
|
|
||||||
|
if projectID > 0 {
|
||||||
|
if !ctx.Repo.CanRead(unit.TypeProjects) {
|
||||||
|
// User must also be able to see the project.
|
||||||
|
ctx.Error(http.StatusBadRequest, "user hasn't permissions to read projects")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if setting.Attachment.Enabled {
|
||||||
|
attachments = form.Files
|
||||||
|
}
|
||||||
|
|
||||||
|
if ctx.HasError() {
|
||||||
|
ctx.JSONError(ctx.GetErrMsg())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if util.IsEmptyString(form.Title) {
|
||||||
|
ctx.JSONError(ctx.Tr("repo.issues.new.title_empty"))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
content := form.Content
|
||||||
|
if filename := ctx.Req.Form.Get("template-file"); filename != "" {
|
||||||
|
if template, err := issue_template.UnmarshalFromRepo(ctx.Repo.GitRepo, ctx.Repo.Repository.DefaultBranch, filename); err == nil {
|
||||||
|
content = issue_template.RenderToMarkdown(template, ctx.Req.Form)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
issue := &issues_model.Issue{
|
||||||
|
RepoID: repo.ID,
|
||||||
|
Repo: repo,
|
||||||
|
Title: form.Title,
|
||||||
|
PosterID: ctx.Doer.ID,
|
||||||
|
Poster: ctx.Doer,
|
||||||
|
MilestoneID: milestoneID,
|
||||||
|
Content: content,
|
||||||
|
Ref: form.Ref,
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := issue_service.NewIssue(ctx, repo, issue, labelIDs, attachments, assigneeIDs, projectID); err != nil {
|
||||||
|
if repo_model.IsErrUserDoesNotHaveAccessToRepo(err) {
|
||||||
|
ctx.Error(http.StatusBadRequest, "UserDoesNotHaveAccessToRepo", err.Error())
|
||||||
|
} else if errors.Is(err, user_model.ErrBlockedUser) {
|
||||||
|
ctx.JSONError(ctx.Tr("repo.issues.new.blocked_user"))
|
||||||
|
} else {
|
||||||
|
ctx.ServerError("NewIssue", err)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Trace("Issue created: %d/%d", repo.ID, issue.ID)
|
||||||
|
if ctx.FormString("redirect_after_creation") == "project" && projectID > 0 {
|
||||||
|
ctx.JSONRedirect(ctx.Repo.RepoLink + "/projects/" + strconv.FormatInt(projectID, 10))
|
||||||
|
} else {
|
||||||
|
ctx.JSONRedirect(issue.Link())
|
||||||
|
}
|
||||||
|
}
|
444
routers/web/repo/issue_page_meta.go
Normal file
444
routers/web/repo/issue_page_meta.go
Normal file
|
@ -0,0 +1,444 @@
|
||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package repo
|
||||||
|
|
||||||
|
import (
|
||||||
|
"sort"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"code.gitea.io/gitea/models/db"
|
||||||
|
issues_model "code.gitea.io/gitea/models/issues"
|
||||||
|
"code.gitea.io/gitea/models/organization"
|
||||||
|
project_model "code.gitea.io/gitea/models/project"
|
||||||
|
repo_model "code.gitea.io/gitea/models/repo"
|
||||||
|
user_model "code.gitea.io/gitea/models/user"
|
||||||
|
"code.gitea.io/gitea/modules/container"
|
||||||
|
"code.gitea.io/gitea/modules/optional"
|
||||||
|
shared_user "code.gitea.io/gitea/routers/web/shared/user"
|
||||||
|
"code.gitea.io/gitea/services/context"
|
||||||
|
issue_service "code.gitea.io/gitea/services/issue"
|
||||||
|
repo_service "code.gitea.io/gitea/services/repository"
|
||||||
|
)
|
||||||
|
|
||||||
|
type issueSidebarMilestoneData struct {
|
||||||
|
SelectedMilestoneID int64
|
||||||
|
OpenMilestones []*issues_model.Milestone
|
||||||
|
ClosedMilestones []*issues_model.Milestone
|
||||||
|
}
|
||||||
|
|
||||||
|
type issueSidebarAssigneesData struct {
|
||||||
|
SelectedAssigneeIDs string
|
||||||
|
CandidateAssignees []*user_model.User
|
||||||
|
}
|
||||||
|
|
||||||
|
type issueSidebarProjectsData struct {
|
||||||
|
SelectedProjectID int64
|
||||||
|
OpenProjects []*project_model.Project
|
||||||
|
ClosedProjects []*project_model.Project
|
||||||
|
}
|
||||||
|
|
||||||
|
type IssuePageMetaData struct {
|
||||||
|
RepoLink string
|
||||||
|
Repository *repo_model.Repository
|
||||||
|
Issue *issues_model.Issue
|
||||||
|
IsPullRequest bool
|
||||||
|
CanModifyIssueOrPull bool
|
||||||
|
|
||||||
|
ReviewersData *issueSidebarReviewersData
|
||||||
|
LabelsData *issueSidebarLabelsData
|
||||||
|
MilestonesData *issueSidebarMilestoneData
|
||||||
|
ProjectsData *issueSidebarProjectsData
|
||||||
|
AssigneesData *issueSidebarAssigneesData
|
||||||
|
}
|
||||||
|
|
||||||
|
func retrieveRepoIssueMetaData(ctx *context.Context, repo *repo_model.Repository, issue *issues_model.Issue, isPull bool) *IssuePageMetaData {
|
||||||
|
data := &IssuePageMetaData{
|
||||||
|
RepoLink: ctx.Repo.RepoLink,
|
||||||
|
Repository: repo,
|
||||||
|
Issue: issue,
|
||||||
|
IsPullRequest: isPull,
|
||||||
|
|
||||||
|
ReviewersData: &issueSidebarReviewersData{},
|
||||||
|
LabelsData: &issueSidebarLabelsData{},
|
||||||
|
MilestonesData: &issueSidebarMilestoneData{},
|
||||||
|
ProjectsData: &issueSidebarProjectsData{},
|
||||||
|
AssigneesData: &issueSidebarAssigneesData{},
|
||||||
|
}
|
||||||
|
ctx.Data["IssuePageMetaData"] = data
|
||||||
|
|
||||||
|
if isPull {
|
||||||
|
data.retrieveReviewersData(ctx)
|
||||||
|
if ctx.Written() {
|
||||||
|
return data
|
||||||
|
}
|
||||||
|
}
|
||||||
|
data.retrieveLabelsData(ctx)
|
||||||
|
if ctx.Written() {
|
||||||
|
return data
|
||||||
|
}
|
||||||
|
|
||||||
|
data.CanModifyIssueOrPull = ctx.Repo.CanWriteIssuesOrPulls(isPull) && !ctx.Repo.Repository.IsArchived
|
||||||
|
if !data.CanModifyIssueOrPull {
|
||||||
|
return data
|
||||||
|
}
|
||||||
|
|
||||||
|
data.retrieveAssigneesDataForIssueWriter(ctx)
|
||||||
|
if ctx.Written() {
|
||||||
|
return data
|
||||||
|
}
|
||||||
|
|
||||||
|
data.retrieveMilestonesDataForIssueWriter(ctx)
|
||||||
|
if ctx.Written() {
|
||||||
|
return data
|
||||||
|
}
|
||||||
|
|
||||||
|
data.retrieveProjectsDataForIssueWriter(ctx)
|
||||||
|
if ctx.Written() {
|
||||||
|
return data
|
||||||
|
}
|
||||||
|
|
||||||
|
PrepareBranchList(ctx)
|
||||||
|
if ctx.Written() {
|
||||||
|
return data
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.Data["CanCreateIssueDependencies"] = ctx.Repo.CanCreateIssueDependencies(ctx, ctx.Doer, isPull)
|
||||||
|
return data
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *IssuePageMetaData) retrieveMilestonesDataForIssueWriter(ctx *context.Context) {
|
||||||
|
var err error
|
||||||
|
if d.Issue != nil {
|
||||||
|
d.MilestonesData.SelectedMilestoneID = d.Issue.MilestoneID
|
||||||
|
}
|
||||||
|
d.MilestonesData.OpenMilestones, err = db.Find[issues_model.Milestone](ctx, issues_model.FindMilestoneOptions{
|
||||||
|
RepoID: d.Repository.ID,
|
||||||
|
IsClosed: optional.Some(false),
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetMilestones", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
d.MilestonesData.ClosedMilestones, err = db.Find[issues_model.Milestone](ctx, issues_model.FindMilestoneOptions{
|
||||||
|
RepoID: d.Repository.ID,
|
||||||
|
IsClosed: optional.Some(true),
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetMilestones", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *IssuePageMetaData) retrieveAssigneesDataForIssueWriter(ctx *context.Context) {
|
||||||
|
var err error
|
||||||
|
d.AssigneesData.CandidateAssignees, err = repo_model.GetRepoAssignees(ctx, d.Repository)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetRepoAssignees", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
d.AssigneesData.CandidateAssignees = shared_user.MakeSelfOnTop(ctx.Doer, d.AssigneesData.CandidateAssignees)
|
||||||
|
if d.Issue != nil {
|
||||||
|
_ = d.Issue.LoadAssignees(ctx)
|
||||||
|
ids := make([]string, 0, len(d.Issue.Assignees))
|
||||||
|
for _, a := range d.Issue.Assignees {
|
||||||
|
ids = append(ids, strconv.FormatInt(a.ID, 10))
|
||||||
|
}
|
||||||
|
d.AssigneesData.SelectedAssigneeIDs = strings.Join(ids, ",")
|
||||||
|
}
|
||||||
|
// FIXME: this is a tricky part which writes ctx.Data["Mentionable*"]
|
||||||
|
handleTeamMentions(ctx)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *IssuePageMetaData) retrieveProjectsDataForIssueWriter(ctx *context.Context) {
|
||||||
|
if d.Issue != nil && d.Issue.Project != nil {
|
||||||
|
d.ProjectsData.SelectedProjectID = d.Issue.Project.ID
|
||||||
|
}
|
||||||
|
d.ProjectsData.OpenProjects, d.ProjectsData.ClosedProjects = retrieveProjectsInternal(ctx, ctx.Repo.Repository)
|
||||||
|
}
|
||||||
|
|
||||||
|
// repoReviewerSelection items to bee shown
|
||||||
|
type repoReviewerSelection struct {
|
||||||
|
IsTeam bool
|
||||||
|
Team *organization.Team
|
||||||
|
User *user_model.User
|
||||||
|
Review *issues_model.Review
|
||||||
|
CanBeDismissed bool
|
||||||
|
CanChange bool
|
||||||
|
Requested bool
|
||||||
|
ItemID int64
|
||||||
|
}
|
||||||
|
|
||||||
|
type issueSidebarReviewersData struct {
|
||||||
|
CanChooseReviewer bool
|
||||||
|
OriginalReviews issues_model.ReviewList
|
||||||
|
TeamReviewers []*repoReviewerSelection
|
||||||
|
Reviewers []*repoReviewerSelection
|
||||||
|
CurrentPullReviewers []*repoReviewerSelection
|
||||||
|
}
|
||||||
|
|
||||||
|
// RetrieveRepoReviewers find all reviewers of a repository. If issue is nil, it means the doer is creating a new PR.
|
||||||
|
func (d *IssuePageMetaData) retrieveReviewersData(ctx *context.Context) {
|
||||||
|
data := d.ReviewersData
|
||||||
|
repo := d.Repository
|
||||||
|
if ctx.Doer != nil && ctx.IsSigned {
|
||||||
|
if d.Issue == nil {
|
||||||
|
data.CanChooseReviewer = true
|
||||||
|
} else {
|
||||||
|
data.CanChooseReviewer = issue_service.CanDoerChangeReviewRequests(ctx, ctx.Doer, repo, d.Issue)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var posterID int64
|
||||||
|
var isClosed bool
|
||||||
|
var reviews issues_model.ReviewList
|
||||||
|
|
||||||
|
if d.Issue == nil {
|
||||||
|
posterID = ctx.Doer.ID
|
||||||
|
} else {
|
||||||
|
posterID = d.Issue.PosterID
|
||||||
|
if d.Issue.OriginalAuthorID > 0 {
|
||||||
|
posterID = 0 // for migrated PRs, no poster ID
|
||||||
|
}
|
||||||
|
|
||||||
|
isClosed = d.Issue.IsClosed || d.Issue.PullRequest.HasMerged
|
||||||
|
|
||||||
|
originalAuthorReviews, err := issues_model.GetReviewersFromOriginalAuthorsByIssueID(ctx, d.Issue.ID)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetReviewersFromOriginalAuthorsByIssueID", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
data.OriginalReviews = originalAuthorReviews
|
||||||
|
|
||||||
|
reviews, err = issues_model.GetReviewsByIssueID(ctx, d.Issue.ID)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetReviewersByIssueID", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if len(reviews) == 0 && !data.CanChooseReviewer {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
pullReviews []*repoReviewerSelection
|
||||||
|
reviewersResult []*repoReviewerSelection
|
||||||
|
teamReviewersResult []*repoReviewerSelection
|
||||||
|
teamReviewers []*organization.Team
|
||||||
|
reviewers []*user_model.User
|
||||||
|
)
|
||||||
|
|
||||||
|
if data.CanChooseReviewer {
|
||||||
|
var err error
|
||||||
|
reviewers, err = repo_model.GetReviewers(ctx, repo, ctx.Doer.ID, posterID)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetReviewers", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
teamReviewers, err = repo_service.GetReviewerTeams(ctx, repo)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetReviewerTeams", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(reviewers) > 0 {
|
||||||
|
reviewersResult = make([]*repoReviewerSelection, 0, len(reviewers))
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(teamReviewers) > 0 {
|
||||||
|
teamReviewersResult = make([]*repoReviewerSelection, 0, len(teamReviewers))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pullReviews = make([]*repoReviewerSelection, 0, len(reviews))
|
||||||
|
|
||||||
|
for _, review := range reviews {
|
||||||
|
tmp := &repoReviewerSelection{
|
||||||
|
Requested: review.Type == issues_model.ReviewTypeRequest,
|
||||||
|
Review: review,
|
||||||
|
ItemID: review.ReviewerID,
|
||||||
|
}
|
||||||
|
if review.ReviewerTeamID > 0 {
|
||||||
|
tmp.IsTeam = true
|
||||||
|
tmp.ItemID = -review.ReviewerTeamID
|
||||||
|
}
|
||||||
|
|
||||||
|
if data.CanChooseReviewer {
|
||||||
|
// Users who can choose reviewers can also remove review requests
|
||||||
|
tmp.CanChange = true
|
||||||
|
} else if ctx.Doer != nil && ctx.Doer.ID == review.ReviewerID && review.Type == issues_model.ReviewTypeRequest {
|
||||||
|
// A user can refuse review requests
|
||||||
|
tmp.CanChange = true
|
||||||
|
}
|
||||||
|
|
||||||
|
pullReviews = append(pullReviews, tmp)
|
||||||
|
|
||||||
|
if data.CanChooseReviewer {
|
||||||
|
if tmp.IsTeam {
|
||||||
|
teamReviewersResult = append(teamReviewersResult, tmp)
|
||||||
|
} else {
|
||||||
|
reviewersResult = append(reviewersResult, tmp)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(pullReviews) > 0 {
|
||||||
|
// Drop all non-existing users and teams from the reviews
|
||||||
|
currentPullReviewers := make([]*repoReviewerSelection, 0, len(pullReviews))
|
||||||
|
for _, item := range pullReviews {
|
||||||
|
if item.Review.ReviewerID > 0 {
|
||||||
|
if err := item.Review.LoadReviewer(ctx); err != nil {
|
||||||
|
if user_model.IsErrUserNotExist(err) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
ctx.ServerError("LoadReviewer", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
item.User = item.Review.Reviewer
|
||||||
|
} else if item.Review.ReviewerTeamID > 0 {
|
||||||
|
if err := item.Review.LoadReviewerTeam(ctx); err != nil {
|
||||||
|
if organization.IsErrTeamNotExist(err) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
ctx.ServerError("LoadReviewerTeam", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
item.Team = item.Review.ReviewerTeam
|
||||||
|
} else {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
item.CanBeDismissed = ctx.Repo.Permission.IsAdmin() && !isClosed &&
|
||||||
|
(item.Review.Type == issues_model.ReviewTypeApprove || item.Review.Type == issues_model.ReviewTypeReject)
|
||||||
|
currentPullReviewers = append(currentPullReviewers, item)
|
||||||
|
}
|
||||||
|
data.CurrentPullReviewers = currentPullReviewers
|
||||||
|
}
|
||||||
|
|
||||||
|
if data.CanChooseReviewer && reviewersResult != nil {
|
||||||
|
preadded := len(reviewersResult)
|
||||||
|
for _, reviewer := range reviewers {
|
||||||
|
found := false
|
||||||
|
reviewAddLoop:
|
||||||
|
for _, tmp := range reviewersResult[:preadded] {
|
||||||
|
if tmp.ItemID == reviewer.ID {
|
||||||
|
tmp.User = reviewer
|
||||||
|
found = true
|
||||||
|
break reviewAddLoop
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if found {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
reviewersResult = append(reviewersResult, &repoReviewerSelection{
|
||||||
|
IsTeam: false,
|
||||||
|
CanChange: true,
|
||||||
|
User: reviewer,
|
||||||
|
ItemID: reviewer.ID,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
data.Reviewers = reviewersResult
|
||||||
|
}
|
||||||
|
|
||||||
|
if data.CanChooseReviewer && teamReviewersResult != nil {
|
||||||
|
preadded := len(teamReviewersResult)
|
||||||
|
for _, team := range teamReviewers {
|
||||||
|
found := false
|
||||||
|
teamReviewAddLoop:
|
||||||
|
for _, tmp := range teamReviewersResult[:preadded] {
|
||||||
|
if tmp.ItemID == -team.ID {
|
||||||
|
tmp.Team = team
|
||||||
|
found = true
|
||||||
|
break teamReviewAddLoop
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if found {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
teamReviewersResult = append(teamReviewersResult, &repoReviewerSelection{
|
||||||
|
IsTeam: true,
|
||||||
|
CanChange: true,
|
||||||
|
Team: team,
|
||||||
|
ItemID: -team.ID,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
data.TeamReviewers = teamReviewersResult
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type issueSidebarLabelsData struct {
|
||||||
|
AllLabels []*issues_model.Label
|
||||||
|
RepoLabels []*issues_model.Label
|
||||||
|
OrgLabels []*issues_model.Label
|
||||||
|
SelectedLabelIDs string
|
||||||
|
}
|
||||||
|
|
||||||
|
func makeSelectedStringIDs[KeyType, ItemType comparable](
|
||||||
|
allLabels []*issues_model.Label, candidateKey func(candidate *issues_model.Label) KeyType,
|
||||||
|
selectedItems []ItemType, selectedKey func(selected ItemType) KeyType,
|
||||||
|
) string {
|
||||||
|
selectedIDSet := make(container.Set[string])
|
||||||
|
allLabelMap := map[KeyType]*issues_model.Label{}
|
||||||
|
for _, label := range allLabels {
|
||||||
|
allLabelMap[candidateKey(label)] = label
|
||||||
|
}
|
||||||
|
for _, item := range selectedItems {
|
||||||
|
if label, ok := allLabelMap[selectedKey(item)]; ok {
|
||||||
|
label.IsChecked = true
|
||||||
|
selectedIDSet.Add(strconv.FormatInt(label.ID, 10))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ids := selectedIDSet.Values()
|
||||||
|
sort.Strings(ids)
|
||||||
|
return strings.Join(ids, ",")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *issueSidebarLabelsData) SetSelectedLabels(labels []*issues_model.Label) {
|
||||||
|
d.SelectedLabelIDs = makeSelectedStringIDs(
|
||||||
|
d.AllLabels, func(label *issues_model.Label) int64 { return label.ID },
|
||||||
|
labels, func(label *issues_model.Label) int64 { return label.ID },
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *issueSidebarLabelsData) SetSelectedLabelNames(labelNames []string) {
|
||||||
|
d.SelectedLabelIDs = makeSelectedStringIDs(
|
||||||
|
d.AllLabels, func(label *issues_model.Label) string { return strings.ToLower(label.Name) },
|
||||||
|
labelNames, strings.ToLower,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *issueSidebarLabelsData) SetSelectedLabelIDs(labelIDs []int64) {
|
||||||
|
d.SelectedLabelIDs = makeSelectedStringIDs(
|
||||||
|
d.AllLabels, func(label *issues_model.Label) int64 { return label.ID },
|
||||||
|
labelIDs, func(labelID int64) int64 { return labelID },
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *IssuePageMetaData) retrieveLabelsData(ctx *context.Context) {
|
||||||
|
repo := d.Repository
|
||||||
|
labelsData := d.LabelsData
|
||||||
|
|
||||||
|
labels, err := issues_model.GetLabelsByRepoID(ctx, repo.ID, "", db.ListOptions{})
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetLabelsByRepoID", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
labelsData.RepoLabels = labels
|
||||||
|
|
||||||
|
if repo.Owner.IsOrganization() {
|
||||||
|
orgLabels, err := issues_model.GetLabelsByOrgID(ctx, repo.Owner.ID, ctx.FormString("sort"), db.ListOptions{})
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
labelsData.OrgLabels = orgLabels
|
||||||
|
}
|
||||||
|
labelsData.AllLabels = append(labelsData.AllLabels, labelsData.RepoLabels...)
|
||||||
|
labelsData.AllLabels = append(labelsData.AllLabels, labelsData.OrgLabels...)
|
||||||
|
}
|
66
routers/web/repo/issue_poster.go
Normal file
66
routers/web/repo/issue_poster.go
Normal file
|
@ -0,0 +1,66 @@
|
||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package repo
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
"slices"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
repo_model "code.gitea.io/gitea/models/repo"
|
||||||
|
user_model "code.gitea.io/gitea/models/user"
|
||||||
|
"code.gitea.io/gitea/modules/setting"
|
||||||
|
shared_user "code.gitea.io/gitea/routers/web/shared/user"
|
||||||
|
"code.gitea.io/gitea/services/context"
|
||||||
|
)
|
||||||
|
|
||||||
|
type userSearchInfo struct {
|
||||||
|
UserID int64 `json:"user_id"`
|
||||||
|
UserName string `json:"username"`
|
||||||
|
AvatarLink string `json:"avatar_link"`
|
||||||
|
FullName string `json:"full_name"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type userSearchResponse struct {
|
||||||
|
Results []*userSearchInfo `json:"results"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// IssuePosters get posters for current repo's issues/pull requests
|
||||||
|
func IssuePosters(ctx *context.Context) {
|
||||||
|
issuePosters(ctx, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
func PullPosters(ctx *context.Context) {
|
||||||
|
issuePosters(ctx, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
func issuePosters(ctx *context.Context, isPullList bool) {
|
||||||
|
repo := ctx.Repo.Repository
|
||||||
|
search := strings.TrimSpace(ctx.FormString("q"))
|
||||||
|
posters, err := repo_model.GetIssuePostersWithSearch(ctx, repo, isPullList, search, setting.UI.DefaultShowFullName)
|
||||||
|
if err != nil {
|
||||||
|
ctx.JSON(http.StatusInternalServerError, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if search == "" && ctx.Doer != nil {
|
||||||
|
// the returned posters slice only contains limited number of users,
|
||||||
|
// to make the current user (doer) can quickly filter their own issues, always add doer to the posters slice
|
||||||
|
if !slices.ContainsFunc(posters, func(user *user_model.User) bool { return user.ID == ctx.Doer.ID }) {
|
||||||
|
posters = append(posters, ctx.Doer)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
posters = shared_user.MakeSelfOnTop(ctx.Doer, posters)
|
||||||
|
|
||||||
|
resp := &userSearchResponse{}
|
||||||
|
resp.Results = make([]*userSearchInfo, len(posters))
|
||||||
|
for i, user := range posters {
|
||||||
|
resp.Results[i] = &userSearchInfo{UserID: user.ID, UserName: user.Name, AvatarLink: user.AvatarLink(ctx)}
|
||||||
|
if setting.UI.DefaultShowFullName {
|
||||||
|
resp.Results[i].FullName = user.FullName
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ctx.JSON(http.StatusOK, resp)
|
||||||
|
}
|
914
routers/web/repo/issue_view.go
Normal file
914
routers/web/repo/issue_view.go
Normal file
|
@ -0,0 +1,914 @@
|
||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package repo
|
||||||
|
|
||||||
|
import (
|
||||||
|
stdCtx "context"
|
||||||
|
"fmt"
|
||||||
|
"math/big"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"sort"
|
||||||
|
|
||||||
|
activities_model "code.gitea.io/gitea/models/activities"
|
||||||
|
"code.gitea.io/gitea/models/db"
|
||||||
|
git_model "code.gitea.io/gitea/models/git"
|
||||||
|
issues_model "code.gitea.io/gitea/models/issues"
|
||||||
|
"code.gitea.io/gitea/models/organization"
|
||||||
|
access_model "code.gitea.io/gitea/models/perm/access"
|
||||||
|
project_model "code.gitea.io/gitea/models/project"
|
||||||
|
pull_model "code.gitea.io/gitea/models/pull"
|
||||||
|
repo_model "code.gitea.io/gitea/models/repo"
|
||||||
|
"code.gitea.io/gitea/models/unit"
|
||||||
|
user_model "code.gitea.io/gitea/models/user"
|
||||||
|
"code.gitea.io/gitea/modules/emoji"
|
||||||
|
"code.gitea.io/gitea/modules/git"
|
||||||
|
"code.gitea.io/gitea/modules/log"
|
||||||
|
"code.gitea.io/gitea/modules/markup"
|
||||||
|
"code.gitea.io/gitea/modules/markup/markdown"
|
||||||
|
"code.gitea.io/gitea/modules/setting"
|
||||||
|
"code.gitea.io/gitea/modules/templates"
|
||||||
|
"code.gitea.io/gitea/modules/templates/vars"
|
||||||
|
asymkey_service "code.gitea.io/gitea/services/asymkey"
|
||||||
|
"code.gitea.io/gitea/services/context"
|
||||||
|
"code.gitea.io/gitea/services/context/upload"
|
||||||
|
issue_service "code.gitea.io/gitea/services/issue"
|
||||||
|
pull_service "code.gitea.io/gitea/services/pull"
|
||||||
|
user_service "code.gitea.io/gitea/services/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
// roleDescriptor returns the role descriptor for a comment in/with the given repo, poster and issue
|
||||||
|
func roleDescriptor(ctx stdCtx.Context, repo *repo_model.Repository, poster *user_model.User, issue *issues_model.Issue, hasOriginalAuthor bool) (issues_model.RoleDescriptor, error) {
|
||||||
|
roleDescriptor := issues_model.RoleDescriptor{}
|
||||||
|
|
||||||
|
if hasOriginalAuthor {
|
||||||
|
return roleDescriptor, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
perm, err := access_model.GetUserRepoPermission(ctx, repo, poster)
|
||||||
|
if err != nil {
|
||||||
|
return roleDescriptor, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// If the poster is the actual poster of the issue, enable Poster role.
|
||||||
|
roleDescriptor.IsPoster = issue.IsPoster(poster.ID)
|
||||||
|
|
||||||
|
// Check if the poster is owner of the repo.
|
||||||
|
if perm.IsOwner() {
|
||||||
|
// If the poster isn't an admin, enable the owner role.
|
||||||
|
if !poster.IsAdmin {
|
||||||
|
roleDescriptor.RoleInRepo = issues_model.RoleRepoOwner
|
||||||
|
return roleDescriptor, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Otherwise check if poster is the real repo admin.
|
||||||
|
ok, err := access_model.IsUserRealRepoAdmin(ctx, repo, poster)
|
||||||
|
if err != nil {
|
||||||
|
return roleDescriptor, err
|
||||||
|
}
|
||||||
|
if ok {
|
||||||
|
roleDescriptor.RoleInRepo = issues_model.RoleRepoOwner
|
||||||
|
return roleDescriptor, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// If repo is organization, check Member role
|
||||||
|
if err := repo.LoadOwner(ctx); err != nil {
|
||||||
|
return roleDescriptor, err
|
||||||
|
}
|
||||||
|
if repo.Owner.IsOrganization() {
|
||||||
|
if isMember, err := organization.IsOrganizationMember(ctx, repo.Owner.ID, poster.ID); err != nil {
|
||||||
|
return roleDescriptor, err
|
||||||
|
} else if isMember {
|
||||||
|
roleDescriptor.RoleInRepo = issues_model.RoleRepoMember
|
||||||
|
return roleDescriptor, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// If the poster is the collaborator of the repo
|
||||||
|
if isCollaborator, err := repo_model.IsCollaborator(ctx, repo.ID, poster.ID); err != nil {
|
||||||
|
return roleDescriptor, err
|
||||||
|
} else if isCollaborator {
|
||||||
|
roleDescriptor.RoleInRepo = issues_model.RoleRepoCollaborator
|
||||||
|
return roleDescriptor, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
hasMergedPR, err := issues_model.HasMergedPullRequestInRepo(ctx, repo.ID, poster.ID)
|
||||||
|
if err != nil {
|
||||||
|
return roleDescriptor, err
|
||||||
|
} else if hasMergedPR {
|
||||||
|
roleDescriptor.RoleInRepo = issues_model.RoleRepoContributor
|
||||||
|
} else if issue.IsPull {
|
||||||
|
// only display first time contributor in the first opening pull request
|
||||||
|
roleDescriptor.RoleInRepo = issues_model.RoleRepoFirstTimeContributor
|
||||||
|
}
|
||||||
|
|
||||||
|
return roleDescriptor, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func getBranchData(ctx *context.Context, issue *issues_model.Issue) {
|
||||||
|
ctx.Data["BaseBranch"] = nil
|
||||||
|
ctx.Data["HeadBranch"] = nil
|
||||||
|
ctx.Data["HeadUserName"] = nil
|
||||||
|
ctx.Data["BaseName"] = ctx.Repo.Repository.OwnerName
|
||||||
|
if issue.IsPull {
|
||||||
|
pull := issue.PullRequest
|
||||||
|
ctx.Data["BaseBranch"] = pull.BaseBranch
|
||||||
|
ctx.Data["HeadBranch"] = pull.HeadBranch
|
||||||
|
ctx.Data["HeadUserName"] = pull.MustHeadUserName(ctx)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// checkBlockedByIssues return canRead and notPermitted
|
||||||
|
func checkBlockedByIssues(ctx *context.Context, blockers []*issues_model.DependencyInfo) (canRead, notPermitted []*issues_model.DependencyInfo) {
|
||||||
|
repoPerms := make(map[int64]access_model.Permission)
|
||||||
|
repoPerms[ctx.Repo.Repository.ID] = ctx.Repo.Permission
|
||||||
|
for _, blocker := range blockers {
|
||||||
|
// Get the permissions for this repository
|
||||||
|
// If the repo ID exists in the map, return the exist permissions
|
||||||
|
// else get the permission and add it to the map
|
||||||
|
var perm access_model.Permission
|
||||||
|
existPerm, ok := repoPerms[blocker.RepoID]
|
||||||
|
if ok {
|
||||||
|
perm = existPerm
|
||||||
|
} else {
|
||||||
|
var err error
|
||||||
|
perm, err = access_model.GetUserRepoPermission(ctx, &blocker.Repository, ctx.Doer)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetUserRepoPermission", err)
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
repoPerms[blocker.RepoID] = perm
|
||||||
|
}
|
||||||
|
if perm.CanReadIssuesOrPulls(blocker.Issue.IsPull) {
|
||||||
|
canRead = append(canRead, blocker)
|
||||||
|
} else {
|
||||||
|
notPermitted = append(notPermitted, blocker)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sortDependencyInfo(canRead)
|
||||||
|
sortDependencyInfo(notPermitted)
|
||||||
|
return canRead, notPermitted
|
||||||
|
}
|
||||||
|
|
||||||
|
func sortDependencyInfo(blockers []*issues_model.DependencyInfo) {
|
||||||
|
sort.Slice(blockers, func(i, j int) bool {
|
||||||
|
if blockers[i].RepoID == blockers[j].RepoID {
|
||||||
|
return blockers[i].Issue.CreatedUnix < blockers[j].Issue.CreatedUnix
|
||||||
|
}
|
||||||
|
return blockers[i].RepoID < blockers[j].RepoID
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func addParticipant(poster *user_model.User, participants []*user_model.User) []*user_model.User {
|
||||||
|
for _, part := range participants {
|
||||||
|
if poster.ID == part.ID {
|
||||||
|
return participants
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return append(participants, poster)
|
||||||
|
}
|
||||||
|
|
||||||
|
func filterXRefComments(ctx *context.Context, issue *issues_model.Issue) error {
|
||||||
|
// Remove comments that the user has no permissions to see
|
||||||
|
for i := 0; i < len(issue.Comments); {
|
||||||
|
c := issue.Comments[i]
|
||||||
|
if issues_model.CommentTypeIsRef(c.Type) && c.RefRepoID != issue.RepoID && c.RefRepoID != 0 {
|
||||||
|
var err error
|
||||||
|
// Set RefRepo for description in template
|
||||||
|
c.RefRepo, err = repo_model.GetRepositoryByID(ctx, c.RefRepoID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
perm, err := access_model.GetUserRepoPermission(ctx, c.RefRepo, ctx.Doer)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !perm.CanReadIssuesOrPulls(c.RefIsPull) {
|
||||||
|
issue.Comments = append(issue.Comments[:i], issue.Comments[i+1:]...)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// combineLabelComments combine the nearby label comments as one.
|
||||||
|
func combineLabelComments(issue *issues_model.Issue) {
|
||||||
|
var prev, cur *issues_model.Comment
|
||||||
|
for i := 0; i < len(issue.Comments); i++ {
|
||||||
|
cur = issue.Comments[i]
|
||||||
|
if i > 0 {
|
||||||
|
prev = issue.Comments[i-1]
|
||||||
|
}
|
||||||
|
if i == 0 || cur.Type != issues_model.CommentTypeLabel ||
|
||||||
|
(prev != nil && prev.PosterID != cur.PosterID) ||
|
||||||
|
(prev != nil && cur.CreatedUnix-prev.CreatedUnix >= 60) {
|
||||||
|
if cur.Type == issues_model.CommentTypeLabel && cur.Label != nil {
|
||||||
|
if cur.Content != "1" {
|
||||||
|
cur.RemovedLabels = append(cur.RemovedLabels, cur.Label)
|
||||||
|
} else {
|
||||||
|
cur.AddedLabels = append(cur.AddedLabels, cur.Label)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
if cur.Label != nil { // now cur MUST be label comment
|
||||||
|
if prev.Type == issues_model.CommentTypeLabel { // we can combine them only prev is a label comment
|
||||||
|
if cur.Content != "1" {
|
||||||
|
// remove labels from the AddedLabels list if the label that was removed is already
|
||||||
|
// in this list, and if it's not in this list, add the label to RemovedLabels
|
||||||
|
addedAndRemoved := false
|
||||||
|
for i, label := range prev.AddedLabels {
|
||||||
|
if cur.Label.ID == label.ID {
|
||||||
|
prev.AddedLabels = append(prev.AddedLabels[:i], prev.AddedLabels[i+1:]...)
|
||||||
|
addedAndRemoved = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !addedAndRemoved {
|
||||||
|
prev.RemovedLabels = append(prev.RemovedLabels, cur.Label)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// remove labels from the RemovedLabels list if the label that was added is already
|
||||||
|
// in this list, and if it's not in this list, add the label to AddedLabels
|
||||||
|
removedAndAdded := false
|
||||||
|
for i, label := range prev.RemovedLabels {
|
||||||
|
if cur.Label.ID == label.ID {
|
||||||
|
prev.RemovedLabels = append(prev.RemovedLabels[:i], prev.RemovedLabels[i+1:]...)
|
||||||
|
removedAndAdded = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !removedAndAdded {
|
||||||
|
prev.AddedLabels = append(prev.AddedLabels, cur.Label)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
prev.CreatedUnix = cur.CreatedUnix
|
||||||
|
// remove the current comment since it has been combined to prev comment
|
||||||
|
issue.Comments = append(issue.Comments[:i], issue.Comments[i+1:]...)
|
||||||
|
i--
|
||||||
|
} else { // if prev is not a label comment, start a new group
|
||||||
|
if cur.Content != "1" {
|
||||||
|
cur.RemovedLabels = append(cur.RemovedLabels, cur.Label)
|
||||||
|
} else {
|
||||||
|
cur.AddedLabels = append(cur.AddedLabels, cur.Label)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ViewIssue render issue view page
|
||||||
|
func ViewIssue(ctx *context.Context) {
|
||||||
|
if ctx.PathParam(":type") == "issues" {
|
||||||
|
// If issue was requested we check if repo has external tracker and redirect
|
||||||
|
extIssueUnit, err := ctx.Repo.Repository.GetUnit(ctx, unit.TypeExternalTracker)
|
||||||
|
if err == nil && extIssueUnit != nil {
|
||||||
|
if extIssueUnit.ExternalTrackerConfig().ExternalTrackerStyle == markup.IssueNameStyleNumeric || extIssueUnit.ExternalTrackerConfig().ExternalTrackerStyle == "" {
|
||||||
|
metas := ctx.Repo.Repository.ComposeMetas(ctx)
|
||||||
|
metas["index"] = ctx.PathParam(":index")
|
||||||
|
res, err := vars.Expand(extIssueUnit.ExternalTrackerConfig().ExternalTrackerFormat, metas)
|
||||||
|
if err != nil {
|
||||||
|
log.Error("unable to expand template vars for issue url. issue: %s, err: %v", metas["index"], err)
|
||||||
|
ctx.ServerError("Expand", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.Redirect(res)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
} else if err != nil && !repo_model.IsErrUnitTypeNotExist(err) {
|
||||||
|
ctx.ServerError("GetUnit", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
issue, err := issues_model.GetIssueByIndex(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64(":index"))
|
||||||
|
if err != nil {
|
||||||
|
if issues_model.IsErrIssueNotExist(err) {
|
||||||
|
ctx.NotFound("GetIssueByIndex", err)
|
||||||
|
} else {
|
||||||
|
ctx.ServerError("GetIssueByIndex", err)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if issue.Repo == nil {
|
||||||
|
issue.Repo = ctx.Repo.Repository
|
||||||
|
}
|
||||||
|
|
||||||
|
// Make sure type and URL matches.
|
||||||
|
if ctx.PathParam(":type") == "issues" && issue.IsPull {
|
||||||
|
ctx.Redirect(issue.Link())
|
||||||
|
return
|
||||||
|
} else if ctx.PathParam(":type") == "pulls" && !issue.IsPull {
|
||||||
|
ctx.Redirect(issue.Link())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if issue.IsPull {
|
||||||
|
MustAllowPulls(ctx)
|
||||||
|
if ctx.Written() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.Data["PageIsPullList"] = true
|
||||||
|
ctx.Data["PageIsPullConversation"] = true
|
||||||
|
} else {
|
||||||
|
MustEnableIssues(ctx)
|
||||||
|
if ctx.Written() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.Data["PageIsIssueList"] = true
|
||||||
|
ctx.Data["NewIssueChooseTemplate"] = issue_service.HasTemplatesOrContactLinks(ctx.Repo.Repository, ctx.Repo.GitRepo)
|
||||||
|
}
|
||||||
|
|
||||||
|
if issue.IsPull && !ctx.Repo.CanRead(unit.TypeIssues) {
|
||||||
|
ctx.Data["IssueDependencySearchType"] = "pulls"
|
||||||
|
} else if !issue.IsPull && !ctx.Repo.CanRead(unit.TypePullRequests) {
|
||||||
|
ctx.Data["IssueDependencySearchType"] = "issues"
|
||||||
|
} else {
|
||||||
|
ctx.Data["IssueDependencySearchType"] = "all"
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.Data["IsProjectsEnabled"] = ctx.Repo.CanRead(unit.TypeProjects)
|
||||||
|
ctx.Data["IsAttachmentEnabled"] = setting.Attachment.Enabled
|
||||||
|
upload.AddUploadContext(ctx, "comment")
|
||||||
|
|
||||||
|
if err = issue.LoadAttributes(ctx); err != nil {
|
||||||
|
ctx.ServerError("LoadAttributes", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err = filterXRefComments(ctx, issue); err != nil {
|
||||||
|
ctx.ServerError("filterXRefComments", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.Data["Title"] = fmt.Sprintf("#%d - %s", issue.Index, emoji.ReplaceAliases(issue.Title))
|
||||||
|
|
||||||
|
iw := new(issues_model.IssueWatch)
|
||||||
|
if ctx.Doer != nil {
|
||||||
|
iw.UserID = ctx.Doer.ID
|
||||||
|
iw.IssueID = issue.ID
|
||||||
|
iw.IsWatching, err = issues_model.CheckIssueWatch(ctx, ctx.Doer, issue)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("CheckIssueWatch", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ctx.Data["IssueWatch"] = iw
|
||||||
|
issue.RenderedContent, err = markdown.RenderString(&markup.RenderContext{
|
||||||
|
Links: markup.Links{
|
||||||
|
Base: ctx.Repo.RepoLink,
|
||||||
|
},
|
||||||
|
Metas: ctx.Repo.Repository.ComposeMetas(ctx),
|
||||||
|
GitRepo: ctx.Repo.GitRepo,
|
||||||
|
Repo: ctx.Repo.Repository,
|
||||||
|
Ctx: ctx,
|
||||||
|
}, issue.Content)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("RenderString", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
repo := ctx.Repo.Repository
|
||||||
|
|
||||||
|
// Get more information if it's a pull request.
|
||||||
|
if issue.IsPull {
|
||||||
|
if issue.PullRequest.HasMerged {
|
||||||
|
ctx.Data["DisableStatusChange"] = issue.PullRequest.HasMerged
|
||||||
|
PrepareMergedViewPullInfo(ctx, issue)
|
||||||
|
} else {
|
||||||
|
PrepareViewPullInfo(ctx, issue)
|
||||||
|
ctx.Data["DisableStatusChange"] = ctx.Data["IsPullRequestBroken"] == true && issue.IsClosed
|
||||||
|
}
|
||||||
|
if ctx.Written() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pageMetaData := retrieveRepoIssueMetaData(ctx, repo, issue, issue.IsPull)
|
||||||
|
if ctx.Written() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
pageMetaData.LabelsData.SetSelectedLabels(issue.Labels)
|
||||||
|
|
||||||
|
if ctx.IsSigned {
|
||||||
|
// Update issue-user.
|
||||||
|
if err = activities_model.SetIssueReadBy(ctx, issue.ID, ctx.Doer.ID); err != nil {
|
||||||
|
ctx.ServerError("ReadBy", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
role issues_model.RoleDescriptor
|
||||||
|
ok bool
|
||||||
|
marked = make(map[int64]issues_model.RoleDescriptor)
|
||||||
|
comment *issues_model.Comment
|
||||||
|
participants = make([]*user_model.User, 1, 10)
|
||||||
|
latestCloseCommentID int64
|
||||||
|
)
|
||||||
|
if ctx.Repo.Repository.IsTimetrackerEnabled(ctx) {
|
||||||
|
if ctx.IsSigned {
|
||||||
|
// Deal with the stopwatch
|
||||||
|
ctx.Data["IsStopwatchRunning"] = issues_model.StopwatchExists(ctx, ctx.Doer.ID, issue.ID)
|
||||||
|
if !ctx.Data["IsStopwatchRunning"].(bool) {
|
||||||
|
var exists bool
|
||||||
|
var swIssue *issues_model.Issue
|
||||||
|
if exists, _, swIssue, err = issues_model.HasUserStopwatch(ctx, ctx.Doer.ID); err != nil {
|
||||||
|
ctx.ServerError("HasUserStopwatch", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.Data["HasUserStopwatch"] = exists
|
||||||
|
if exists {
|
||||||
|
// Add warning if the user has already a stopwatch
|
||||||
|
// Add link to the issue of the already running stopwatch
|
||||||
|
ctx.Data["OtherStopwatchURL"] = swIssue.Link()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ctx.Data["CanUseTimetracker"] = ctx.Repo.CanUseTimetracker(ctx, issue, ctx.Doer)
|
||||||
|
} else {
|
||||||
|
ctx.Data["CanUseTimetracker"] = false
|
||||||
|
}
|
||||||
|
if ctx.Data["WorkingUsers"], err = issues_model.TotalTimesForEachUser(ctx, &issues_model.FindTrackedTimesOptions{IssueID: issue.ID}); err != nil {
|
||||||
|
ctx.ServerError("TotalTimesForEachUser", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if the user can use the dependencies
|
||||||
|
ctx.Data["CanCreateIssueDependencies"] = ctx.Repo.CanCreateIssueDependencies(ctx, ctx.Doer, issue.IsPull)
|
||||||
|
|
||||||
|
// check if dependencies can be created across repositories
|
||||||
|
ctx.Data["AllowCrossRepositoryDependencies"] = setting.Service.AllowCrossRepositoryDependencies
|
||||||
|
|
||||||
|
if issue.ShowRole, err = roleDescriptor(ctx, repo, issue.Poster, issue, issue.HasOriginalAuthor()); err != nil {
|
||||||
|
ctx.ServerError("roleDescriptor", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
marked[issue.PosterID] = issue.ShowRole
|
||||||
|
|
||||||
|
// Render comments and fetch participants.
|
||||||
|
participants[0] = issue.Poster
|
||||||
|
|
||||||
|
if err := issue.Comments.LoadAttachmentsByIssue(ctx); err != nil {
|
||||||
|
ctx.ServerError("LoadAttachmentsByIssue", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := issue.Comments.LoadPosters(ctx); err != nil {
|
||||||
|
ctx.ServerError("LoadPosters", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, comment = range issue.Comments {
|
||||||
|
comment.Issue = issue
|
||||||
|
|
||||||
|
if comment.Type == issues_model.CommentTypeComment || comment.Type == issues_model.CommentTypeReview {
|
||||||
|
comment.RenderedContent, err = markdown.RenderString(&markup.RenderContext{
|
||||||
|
Links: markup.Links{
|
||||||
|
Base: ctx.Repo.RepoLink,
|
||||||
|
},
|
||||||
|
Metas: ctx.Repo.Repository.ComposeMetas(ctx),
|
||||||
|
GitRepo: ctx.Repo.GitRepo,
|
||||||
|
Repo: ctx.Repo.Repository,
|
||||||
|
Ctx: ctx,
|
||||||
|
}, comment.Content)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("RenderString", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Check tag.
|
||||||
|
role, ok = marked[comment.PosterID]
|
||||||
|
if ok {
|
||||||
|
comment.ShowRole = role
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
comment.ShowRole, err = roleDescriptor(ctx, repo, comment.Poster, issue, comment.HasOriginalAuthor())
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("roleDescriptor", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
marked[comment.PosterID] = comment.ShowRole
|
||||||
|
participants = addParticipant(comment.Poster, participants)
|
||||||
|
} else if comment.Type == issues_model.CommentTypeLabel {
|
||||||
|
if err = comment.LoadLabel(ctx); err != nil {
|
||||||
|
ctx.ServerError("LoadLabel", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
} else if comment.Type == issues_model.CommentTypeMilestone {
|
||||||
|
if err = comment.LoadMilestone(ctx); err != nil {
|
||||||
|
ctx.ServerError("LoadMilestone", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ghostMilestone := &issues_model.Milestone{
|
||||||
|
ID: -1,
|
||||||
|
Name: ctx.Locale.TrString("repo.issues.deleted_milestone"),
|
||||||
|
}
|
||||||
|
if comment.OldMilestoneID > 0 && comment.OldMilestone == nil {
|
||||||
|
comment.OldMilestone = ghostMilestone
|
||||||
|
}
|
||||||
|
if comment.MilestoneID > 0 && comment.Milestone == nil {
|
||||||
|
comment.Milestone = ghostMilestone
|
||||||
|
}
|
||||||
|
} else if comment.Type == issues_model.CommentTypeProject {
|
||||||
|
if err = comment.LoadProject(ctx); err != nil {
|
||||||
|
ctx.ServerError("LoadProject", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ghostProject := &project_model.Project{
|
||||||
|
ID: project_model.GhostProjectID,
|
||||||
|
Title: ctx.Locale.TrString("repo.issues.deleted_project"),
|
||||||
|
}
|
||||||
|
|
||||||
|
if comment.OldProjectID > 0 && comment.OldProject == nil {
|
||||||
|
comment.OldProject = ghostProject
|
||||||
|
}
|
||||||
|
|
||||||
|
if comment.ProjectID > 0 && comment.Project == nil {
|
||||||
|
comment.Project = ghostProject
|
||||||
|
}
|
||||||
|
} else if comment.Type == issues_model.CommentTypeProjectColumn {
|
||||||
|
if err = comment.LoadProject(ctx); err != nil {
|
||||||
|
ctx.ServerError("LoadProject", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
} else if comment.Type == issues_model.CommentTypeAssignees || comment.Type == issues_model.CommentTypeReviewRequest {
|
||||||
|
if err = comment.LoadAssigneeUserAndTeam(ctx); err != nil {
|
||||||
|
ctx.ServerError("LoadAssigneeUserAndTeam", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
} else if comment.Type == issues_model.CommentTypeRemoveDependency || comment.Type == issues_model.CommentTypeAddDependency {
|
||||||
|
if err = comment.LoadDepIssueDetails(ctx); err != nil {
|
||||||
|
if !issues_model.IsErrIssueNotExist(err) {
|
||||||
|
ctx.ServerError("LoadDepIssueDetails", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if comment.Type.HasContentSupport() {
|
||||||
|
comment.RenderedContent, err = markdown.RenderString(&markup.RenderContext{
|
||||||
|
Links: markup.Links{
|
||||||
|
Base: ctx.Repo.RepoLink,
|
||||||
|
},
|
||||||
|
Metas: ctx.Repo.Repository.ComposeMetas(ctx),
|
||||||
|
GitRepo: ctx.Repo.GitRepo,
|
||||||
|
Repo: ctx.Repo.Repository,
|
||||||
|
Ctx: ctx,
|
||||||
|
}, comment.Content)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("RenderString", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err = comment.LoadReview(ctx); err != nil && !issues_model.IsErrReviewNotExist(err) {
|
||||||
|
ctx.ServerError("LoadReview", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
participants = addParticipant(comment.Poster, participants)
|
||||||
|
if comment.Review == nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if err = comment.Review.LoadAttributes(ctx); err != nil {
|
||||||
|
if !user_model.IsErrUserNotExist(err) {
|
||||||
|
ctx.ServerError("Review.LoadAttributes", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
comment.Review.Reviewer = user_model.NewGhostUser()
|
||||||
|
}
|
||||||
|
if err = comment.Review.LoadCodeComments(ctx); err != nil {
|
||||||
|
ctx.ServerError("Review.LoadCodeComments", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
for _, codeComments := range comment.Review.CodeComments {
|
||||||
|
for _, lineComments := range codeComments {
|
||||||
|
for _, c := range lineComments {
|
||||||
|
// Check tag.
|
||||||
|
role, ok = marked[c.PosterID]
|
||||||
|
if ok {
|
||||||
|
c.ShowRole = role
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
c.ShowRole, err = roleDescriptor(ctx, repo, c.Poster, issue, c.HasOriginalAuthor())
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("roleDescriptor", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
marked[c.PosterID] = c.ShowRole
|
||||||
|
participants = addParticipant(c.Poster, participants)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err = comment.LoadResolveDoer(ctx); err != nil {
|
||||||
|
ctx.ServerError("LoadResolveDoer", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
} else if comment.Type == issues_model.CommentTypePullRequestPush {
|
||||||
|
participants = addParticipant(comment.Poster, participants)
|
||||||
|
if err = comment.LoadPushCommits(ctx); err != nil {
|
||||||
|
ctx.ServerError("LoadPushCommits", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !ctx.Repo.CanRead(unit.TypeActions) {
|
||||||
|
for _, commit := range comment.Commits {
|
||||||
|
commit.Status.HideActionsURL(ctx)
|
||||||
|
git_model.CommitStatusesHideActionsURL(ctx, commit.Statuses)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if comment.Type == issues_model.CommentTypeAddTimeManual ||
|
||||||
|
comment.Type == issues_model.CommentTypeStopTracking ||
|
||||||
|
comment.Type == issues_model.CommentTypeDeleteTimeManual {
|
||||||
|
// drop error since times could be pruned from DB..
|
||||||
|
_ = comment.LoadTime(ctx)
|
||||||
|
if comment.Content != "" {
|
||||||
|
// Content before v1.21 did store the formatted string instead of seconds,
|
||||||
|
// so "|" is used as delimiter to mark the new format
|
||||||
|
if comment.Content[0] != '|' {
|
||||||
|
// handle old time comments that have formatted text stored
|
||||||
|
comment.RenderedContent = templates.SanitizeHTML(comment.Content)
|
||||||
|
comment.Content = ""
|
||||||
|
} else {
|
||||||
|
// else it's just a duration in seconds to pass on to the frontend
|
||||||
|
comment.Content = comment.Content[1:]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if comment.Type == issues_model.CommentTypeClose || comment.Type == issues_model.CommentTypeMergePull {
|
||||||
|
// record ID of the latest closed/merged comment.
|
||||||
|
// if PR is closed, the comments whose type is CommentTypePullRequestPush(29) after latestCloseCommentID won't be rendered.
|
||||||
|
latestCloseCommentID = comment.ID
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.Data["LatestCloseCommentID"] = latestCloseCommentID
|
||||||
|
|
||||||
|
// Combine multiple label assignments into a single comment
|
||||||
|
combineLabelComments(issue)
|
||||||
|
|
||||||
|
getBranchData(ctx, issue)
|
||||||
|
if issue.IsPull {
|
||||||
|
pull := issue.PullRequest
|
||||||
|
pull.Issue = issue
|
||||||
|
canDelete := false
|
||||||
|
allowMerge := false
|
||||||
|
canWriteToHeadRepo := false
|
||||||
|
|
||||||
|
if ctx.IsSigned {
|
||||||
|
if err := pull.LoadHeadRepo(ctx); err != nil {
|
||||||
|
log.Error("LoadHeadRepo: %v", err)
|
||||||
|
} else if pull.HeadRepo != nil {
|
||||||
|
perm, err := access_model.GetUserRepoPermission(ctx, pull.HeadRepo, ctx.Doer)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetUserRepoPermission", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if perm.CanWrite(unit.TypeCode) {
|
||||||
|
// Check if branch is not protected
|
||||||
|
if pull.HeadBranch != pull.HeadRepo.DefaultBranch {
|
||||||
|
if protected, err := git_model.IsBranchProtected(ctx, pull.HeadRepo.ID, pull.HeadBranch); err != nil {
|
||||||
|
log.Error("IsProtectedBranch: %v", err)
|
||||||
|
} else if !protected {
|
||||||
|
canDelete = true
|
||||||
|
ctx.Data["DeleteBranchLink"] = issue.Link() + "/cleanup"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
canWriteToHeadRepo = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := pull.LoadBaseRepo(ctx); err != nil {
|
||||||
|
log.Error("LoadBaseRepo: %v", err)
|
||||||
|
}
|
||||||
|
perm, err := access_model.GetUserRepoPermission(ctx, pull.BaseRepo, ctx.Doer)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetUserRepoPermission", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !canWriteToHeadRepo { // maintainers maybe allowed to push to head repo even if they can't write to it
|
||||||
|
canWriteToHeadRepo = pull.AllowMaintainerEdit && perm.CanWrite(unit.TypeCode)
|
||||||
|
}
|
||||||
|
allowMerge, err = pull_service.IsUserAllowedToMerge(ctx, pull, perm, ctx.Doer)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("IsUserAllowedToMerge", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if ctx.Data["CanMarkConversation"], err = issues_model.CanMarkConversation(ctx, issue, ctx.Doer); err != nil {
|
||||||
|
ctx.ServerError("CanMarkConversation", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.Data["CanWriteToHeadRepo"] = canWriteToHeadRepo
|
||||||
|
ctx.Data["ShowMergeInstructions"] = canWriteToHeadRepo
|
||||||
|
ctx.Data["AllowMerge"] = allowMerge
|
||||||
|
|
||||||
|
prUnit, err := repo.GetUnit(ctx, unit.TypePullRequests)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetUnit", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
prConfig := prUnit.PullRequestsConfig()
|
||||||
|
|
||||||
|
ctx.Data["AutodetectManualMerge"] = prConfig.AutodetectManualMerge
|
||||||
|
|
||||||
|
var mergeStyle repo_model.MergeStyle
|
||||||
|
// Check correct values and select default
|
||||||
|
if ms, ok := ctx.Data["MergeStyle"].(repo_model.MergeStyle); !ok ||
|
||||||
|
!prConfig.IsMergeStyleAllowed(ms) {
|
||||||
|
defaultMergeStyle := prConfig.GetDefaultMergeStyle()
|
||||||
|
if prConfig.IsMergeStyleAllowed(defaultMergeStyle) && !ok {
|
||||||
|
mergeStyle = defaultMergeStyle
|
||||||
|
} else if prConfig.AllowMerge {
|
||||||
|
mergeStyle = repo_model.MergeStyleMerge
|
||||||
|
} else if prConfig.AllowRebase {
|
||||||
|
mergeStyle = repo_model.MergeStyleRebase
|
||||||
|
} else if prConfig.AllowRebaseMerge {
|
||||||
|
mergeStyle = repo_model.MergeStyleRebaseMerge
|
||||||
|
} else if prConfig.AllowSquash {
|
||||||
|
mergeStyle = repo_model.MergeStyleSquash
|
||||||
|
} else if prConfig.AllowFastForwardOnly {
|
||||||
|
mergeStyle = repo_model.MergeStyleFastForwardOnly
|
||||||
|
} else if prConfig.AllowManualMerge {
|
||||||
|
mergeStyle = repo_model.MergeStyleManuallyMerged
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.Data["MergeStyle"] = mergeStyle
|
||||||
|
|
||||||
|
defaultMergeMessage, defaultMergeBody, err := pull_service.GetDefaultMergeMessage(ctx, ctx.Repo.GitRepo, pull, mergeStyle)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetDefaultMergeMessage", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.Data["DefaultMergeMessage"] = defaultMergeMessage
|
||||||
|
ctx.Data["DefaultMergeBody"] = defaultMergeBody
|
||||||
|
|
||||||
|
defaultSquashMergeMessage, defaultSquashMergeBody, err := pull_service.GetDefaultMergeMessage(ctx, ctx.Repo.GitRepo, pull, repo_model.MergeStyleSquash)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetDefaultSquashMergeMessage", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.Data["DefaultSquashMergeMessage"] = defaultSquashMergeMessage
|
||||||
|
ctx.Data["DefaultSquashMergeBody"] = defaultSquashMergeBody
|
||||||
|
|
||||||
|
pb, err := git_model.GetFirstMatchProtectedBranchRule(ctx, pull.BaseRepoID, pull.BaseBranch)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("LoadProtectedBranch", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if pb != nil {
|
||||||
|
pb.Repo = pull.BaseRepo
|
||||||
|
ctx.Data["ProtectedBranch"] = pb
|
||||||
|
ctx.Data["IsBlockedByApprovals"] = !issues_model.HasEnoughApprovals(ctx, pb, pull)
|
||||||
|
ctx.Data["IsBlockedByRejection"] = issues_model.MergeBlockedByRejectedReview(ctx, pb, pull)
|
||||||
|
ctx.Data["IsBlockedByOfficialReviewRequests"] = issues_model.MergeBlockedByOfficialReviewRequests(ctx, pb, pull)
|
||||||
|
ctx.Data["IsBlockedByOutdatedBranch"] = issues_model.MergeBlockedByOutdatedBranch(pb, pull)
|
||||||
|
ctx.Data["GrantedApprovals"] = issues_model.GetGrantedApprovalsCount(ctx, pb, pull)
|
||||||
|
ctx.Data["RequireSigned"] = pb.RequireSignedCommits
|
||||||
|
ctx.Data["ChangedProtectedFiles"] = pull.ChangedProtectedFiles
|
||||||
|
ctx.Data["IsBlockedByChangedProtectedFiles"] = len(pull.ChangedProtectedFiles) != 0
|
||||||
|
ctx.Data["ChangedProtectedFilesNum"] = len(pull.ChangedProtectedFiles)
|
||||||
|
ctx.Data["RequireApprovalsWhitelist"] = pb.EnableApprovalsWhitelist
|
||||||
|
}
|
||||||
|
ctx.Data["WillSign"] = false
|
||||||
|
if ctx.Doer != nil {
|
||||||
|
sign, key, _, err := asymkey_service.SignMerge(ctx, pull, ctx.Doer, pull.BaseRepo.RepoPath(), pull.BaseBranch, pull.GetGitRefName())
|
||||||
|
ctx.Data["WillSign"] = sign
|
||||||
|
ctx.Data["SigningKey"] = key
|
||||||
|
if err != nil {
|
||||||
|
if asymkey_service.IsErrWontSign(err) {
|
||||||
|
ctx.Data["WontSignReason"] = err.(*asymkey_service.ErrWontSign).Reason
|
||||||
|
} else {
|
||||||
|
ctx.Data["WontSignReason"] = "error"
|
||||||
|
log.Error("Error whilst checking if could sign pr %d in repo %s. Error: %v", pull.ID, pull.BaseRepo.FullName(), err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
ctx.Data["WontSignReason"] = "not_signed_in"
|
||||||
|
}
|
||||||
|
|
||||||
|
isPullBranchDeletable := canDelete &&
|
||||||
|
pull.HeadRepo != nil &&
|
||||||
|
git.IsBranchExist(ctx, pull.HeadRepo.RepoPath(), pull.HeadBranch) &&
|
||||||
|
(!pull.HasMerged || ctx.Data["HeadBranchCommitID"] == ctx.Data["PullHeadCommitID"])
|
||||||
|
|
||||||
|
if isPullBranchDeletable && pull.HasMerged {
|
||||||
|
exist, err := issues_model.HasUnmergedPullRequestsByHeadInfo(ctx, pull.HeadRepoID, pull.HeadBranch)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("HasUnmergedPullRequestsByHeadInfo", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
isPullBranchDeletable = !exist
|
||||||
|
}
|
||||||
|
ctx.Data["IsPullBranchDeletable"] = isPullBranchDeletable
|
||||||
|
|
||||||
|
stillCanManualMerge := func() bool {
|
||||||
|
if pull.HasMerged || issue.IsClosed || !ctx.IsSigned {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if pull.CanAutoMerge() || pull.IsWorkInProgress(ctx) || pull.IsChecking() {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if allowMerge && prConfig.AllowManualMerge {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.Data["StillCanManualMerge"] = stillCanManualMerge()
|
||||||
|
|
||||||
|
// Check if there is a pending pr merge
|
||||||
|
ctx.Data["HasPendingPullRequestMerge"], ctx.Data["PendingPullRequestMerge"], err = pull_model.GetScheduledMergeByPullID(ctx, pull.ID)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetScheduledMergeByPullID", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get Dependencies
|
||||||
|
blockedBy, err := issue.BlockedByDependencies(ctx, db.ListOptions{})
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("BlockedByDependencies", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.Data["BlockedByDependencies"], ctx.Data["BlockedByDependenciesNotPermitted"] = checkBlockedByIssues(ctx, blockedBy)
|
||||||
|
if ctx.Written() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
blocking, err := issue.BlockingDependencies(ctx)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("BlockingDependencies", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.Data["BlockingDependencies"], ctx.Data["BlockingDependenciesNotPermitted"] = checkBlockedByIssues(ctx, blocking)
|
||||||
|
if ctx.Written() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var pinAllowed bool
|
||||||
|
if !issue.IsPinned() {
|
||||||
|
pinAllowed, err = issues_model.IsNewPinAllowed(ctx, issue.RepoID, issue.IsPull)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("IsNewPinAllowed", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
pinAllowed = true
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.Data["Participants"] = participants
|
||||||
|
ctx.Data["NumParticipants"] = len(participants)
|
||||||
|
ctx.Data["Issue"] = issue
|
||||||
|
ctx.Data["Reference"] = issue.Ref
|
||||||
|
ctx.Data["SignInLink"] = setting.AppSubURL + "/user/login?redirect_to=" + url.QueryEscape(ctx.Data["Link"].(string))
|
||||||
|
ctx.Data["IsIssuePoster"] = ctx.IsSigned && issue.IsPoster(ctx.Doer.ID)
|
||||||
|
ctx.Data["HasIssuesOrPullsWritePermission"] = ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull)
|
||||||
|
ctx.Data["HasProjectsWritePermission"] = ctx.Repo.CanWrite(unit.TypeProjects)
|
||||||
|
ctx.Data["IsRepoAdmin"] = ctx.IsSigned && (ctx.Repo.IsAdmin() || ctx.Doer.IsAdmin)
|
||||||
|
ctx.Data["LockReasons"] = setting.Repository.Issue.LockReasons
|
||||||
|
ctx.Data["RefEndName"] = git.RefName(issue.Ref).ShortName()
|
||||||
|
ctx.Data["NewPinAllowed"] = pinAllowed
|
||||||
|
ctx.Data["PinEnabled"] = setting.Repository.Issue.MaxPinned != 0
|
||||||
|
|
||||||
|
var hiddenCommentTypes *big.Int
|
||||||
|
if ctx.IsSigned {
|
||||||
|
val, err := user_model.GetUserSetting(ctx, ctx.Doer.ID, user_model.SettingsKeyHiddenCommentTypes)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetUserSetting", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
hiddenCommentTypes, _ = new(big.Int).SetString(val, 10) // we can safely ignore the failed conversion here
|
||||||
|
}
|
||||||
|
ctx.Data["ShouldShowCommentType"] = func(commentType issues_model.CommentType) bool {
|
||||||
|
return hiddenCommentTypes == nil || hiddenCommentTypes.Bit(int(commentType)) == 0
|
||||||
|
}
|
||||||
|
// For sidebar
|
||||||
|
PrepareBranchList(ctx)
|
||||||
|
|
||||||
|
if ctx.Written() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
tags, err := repo_model.GetTagNamesByRepoID(ctx, ctx.Repo.Repository.ID)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetTagNamesByRepoID", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.Data["Tags"] = tags
|
||||||
|
|
||||||
|
ctx.Data["CanBlockUser"] = func(blocker, blockee *user_model.User) bool {
|
||||||
|
return user_service.CanBlockUser(ctx, ctx.Doer, blocker, blockee)
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.HTML(http.StatusOK, tplIssueView)
|
||||||
|
}
|
|
@ -1269,7 +1269,7 @@ func CompareAndPullRequestPost(ctx *context.Context) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
validateRet := ValidateRepoMetas(ctx, *form, true)
|
validateRet := ValidateRepoMetasForNewIssue(ctx, *form, true)
|
||||||
if ctx.Written() {
|
if ctx.Written() {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,7 @@ import (
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
issues_model "code.gitea.io/gitea/models/issues"
|
issues_model "code.gitea.io/gitea/models/issues"
|
||||||
|
"code.gitea.io/gitea/models/organization"
|
||||||
pull_model "code.gitea.io/gitea/models/pull"
|
pull_model "code.gitea.io/gitea/models/pull"
|
||||||
user_model "code.gitea.io/gitea/models/user"
|
user_model "code.gitea.io/gitea/models/user"
|
||||||
"code.gitea.io/gitea/modules/base"
|
"code.gitea.io/gitea/modules/base"
|
||||||
|
@ -19,6 +20,7 @@ import (
|
||||||
"code.gitea.io/gitea/services/context"
|
"code.gitea.io/gitea/services/context"
|
||||||
"code.gitea.io/gitea/services/context/upload"
|
"code.gitea.io/gitea/services/context/upload"
|
||||||
"code.gitea.io/gitea/services/forms"
|
"code.gitea.io/gitea/services/forms"
|
||||||
|
issue_service "code.gitea.io/gitea/services/issue"
|
||||||
pull_service "code.gitea.io/gitea/services/pull"
|
pull_service "code.gitea.io/gitea/services/pull"
|
||||||
user_service "code.gitea.io/gitea/services/user"
|
user_service "code.gitea.io/gitea/services/user"
|
||||||
)
|
)
|
||||||
|
@ -332,3 +334,118 @@ func UpdateViewedFiles(ctx *context.Context) {
|
||||||
ctx.ServerError("UpdateReview", err)
|
ctx.ServerError("UpdateReview", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// UpdatePullReviewRequest add or remove review request
|
||||||
|
func UpdatePullReviewRequest(ctx *context.Context) {
|
||||||
|
issues := getActionIssues(ctx)
|
||||||
|
if ctx.Written() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
reviewID := ctx.FormInt64("id")
|
||||||
|
action := ctx.FormString("action")
|
||||||
|
|
||||||
|
// TODO: Not support 'clear' now
|
||||||
|
if action != "attach" && action != "detach" {
|
||||||
|
ctx.Status(http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, issue := range issues {
|
||||||
|
if err := issue.LoadRepo(ctx); err != nil {
|
||||||
|
ctx.ServerError("issue.LoadRepo", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if !issue.IsPull {
|
||||||
|
log.Warn(
|
||||||
|
"UpdatePullReviewRequest: refusing to add review request for non-PR issue %-v#%d",
|
||||||
|
issue.Repo, issue.Index,
|
||||||
|
)
|
||||||
|
ctx.Status(http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if reviewID < 0 {
|
||||||
|
// negative reviewIDs represent team requests
|
||||||
|
if err := issue.Repo.LoadOwner(ctx); err != nil {
|
||||||
|
ctx.ServerError("issue.Repo.LoadOwner", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if !issue.Repo.Owner.IsOrganization() {
|
||||||
|
log.Warn(
|
||||||
|
"UpdatePullReviewRequest: refusing to add team review request for %s#%d owned by non organization UID[%d]",
|
||||||
|
issue.Repo.FullName(), issue.Index, issue.Repo.ID,
|
||||||
|
)
|
||||||
|
ctx.Status(http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
team, err := organization.GetTeamByID(ctx, -reviewID)
|
||||||
|
if err != nil {
|
||||||
|
ctx.ServerError("GetTeamByID", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if team.OrgID != issue.Repo.OwnerID {
|
||||||
|
log.Warn(
|
||||||
|
"UpdatePullReviewRequest: refusing to add team review request for UID[%d] team %s to %s#%d owned by UID[%d]",
|
||||||
|
team.OrgID, team.Name, issue.Repo.FullName(), issue.Index, issue.Repo.ID)
|
||||||
|
ctx.Status(http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = issue_service.TeamReviewRequest(ctx, issue, ctx.Doer, team, action == "attach")
|
||||||
|
if err != nil {
|
||||||
|
if issues_model.IsErrNotValidReviewRequest(err) {
|
||||||
|
log.Warn(
|
||||||
|
"UpdatePullReviewRequest: refusing to add invalid team review request for UID[%d] team %s to %s#%d owned by UID[%d]: Error: %v",
|
||||||
|
team.OrgID, team.Name, issue.Repo.FullName(), issue.Index, issue.Repo.ID,
|
||||||
|
err,
|
||||||
|
)
|
||||||
|
ctx.Status(http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.ServerError("TeamReviewRequest", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
reviewer, err := user_model.GetUserByID(ctx, reviewID)
|
||||||
|
if err != nil {
|
||||||
|
if user_model.IsErrUserNotExist(err) {
|
||||||
|
log.Warn(
|
||||||
|
"UpdatePullReviewRequest: requested reviewer [%d] for %-v to %-v#%d is not exist: Error: %v",
|
||||||
|
reviewID, issue.Repo, issue.Index,
|
||||||
|
err,
|
||||||
|
)
|
||||||
|
ctx.Status(http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.ServerError("GetUserByID", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = issue_service.ReviewRequest(ctx, issue, ctx.Doer, &ctx.Repo.Permission, reviewer, action == "attach")
|
||||||
|
if err != nil {
|
||||||
|
if issues_model.IsErrNotValidReviewRequest(err) {
|
||||||
|
log.Warn(
|
||||||
|
"UpdatePullReviewRequest: refusing to add invalid review request for %-v to %-v#%d: Error: %v",
|
||||||
|
reviewer, issue.Repo, issue.Index,
|
||||||
|
err,
|
||||||
|
)
|
||||||
|
ctx.Status(http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if issues_model.IsErrReviewRequestOnClosedPR(err) {
|
||||||
|
ctx.Status(http.StatusForbidden)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
ctx.ServerError("ReviewRequest", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.JSONOK()
|
||||||
|
}
|
||||||
|
|
|
@ -1164,7 +1164,7 @@ func registerRoutes(m *web.Router) {
|
||||||
m.Get("/issues/posters", repo.IssuePosters) // it can't use {type:issues|pulls} because it would conflict with other routes like "/pulls/{index}"
|
m.Get("/issues/posters", repo.IssuePosters) // it can't use {type:issues|pulls} because it would conflict with other routes like "/pulls/{index}"
|
||||||
m.Get("/pulls/posters", repo.PullPosters)
|
m.Get("/pulls/posters", repo.PullPosters)
|
||||||
m.Get("/comments/{id}/attachments", repo.GetCommentAttachments)
|
m.Get("/comments/{id}/attachments", repo.GetCommentAttachments)
|
||||||
m.Get("/labels", repo.RetrieveLabels, repo.Labels)
|
m.Get("/labels", repo.RetrieveLabelsForList, repo.Labels)
|
||||||
m.Get("/milestones", repo.Milestones)
|
m.Get("/milestones", repo.Milestones)
|
||||||
m.Get("/milestone/{id}", context.RepoRef(), repo.MilestoneIssuesAndPulls)
|
m.Get("/milestone/{id}", context.RepoRef(), repo.MilestoneIssuesAndPulls)
|
||||||
m.Group("/{type:issues|pulls}", func() {
|
m.Group("/{type:issues|pulls}", func() {
|
||||||
|
|
|
@ -26,7 +26,6 @@ type Organization struct {
|
||||||
Organization *organization.Organization
|
Organization *organization.Organization
|
||||||
OrgLink string
|
OrgLink string
|
||||||
CanCreateOrgRepo bool
|
CanCreateOrgRepo bool
|
||||||
PublicMemberOnly bool // Only display public members
|
|
||||||
|
|
||||||
Team *organization.Team
|
Team *organization.Team
|
||||||
Teams []*organization.Team
|
Teams []*organization.Team
|
||||||
|
@ -176,10 +175,10 @@ func HandleOrgAssignment(ctx *Context, args ...bool) {
|
||||||
ctx.Data["OrgLink"] = ctx.Org.OrgLink
|
ctx.Data["OrgLink"] = ctx.Org.OrgLink
|
||||||
|
|
||||||
// Member
|
// Member
|
||||||
ctx.Org.PublicMemberOnly = ctx.Doer == nil || !ctx.Org.IsMember && !ctx.Doer.IsAdmin
|
|
||||||
opts := &organization.FindOrgMembersOpts{
|
opts := &organization.FindOrgMembersOpts{
|
||||||
OrgID: org.ID,
|
Doer: ctx.Doer,
|
||||||
PublicOnly: ctx.Org.PublicMemberOnly,
|
OrgID: org.ID,
|
||||||
|
IsDoerMember: ctx.Org.IsMember,
|
||||||
}
|
}
|
||||||
ctx.Data["NumMembers"], err = organization.CountOrgMembers(ctx, opts)
|
ctx.Data["NumMembers"], err = organization.CountOrgMembers(ctx, opts)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
70
services/doctor/actions.go
Normal file
70
services/doctor/actions.go
Normal file
|
@ -0,0 +1,70 @@
|
||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package doctor
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"code.gitea.io/gitea/models/db"
|
||||||
|
repo_model "code.gitea.io/gitea/models/repo"
|
||||||
|
unit_model "code.gitea.io/gitea/models/unit"
|
||||||
|
"code.gitea.io/gitea/modules/log"
|
||||||
|
"code.gitea.io/gitea/modules/optional"
|
||||||
|
repo_service "code.gitea.io/gitea/services/repository"
|
||||||
|
)
|
||||||
|
|
||||||
|
func disableMirrorActionsUnit(ctx context.Context, logger log.Logger, autofix bool) error {
|
||||||
|
var reposToFix []*repo_model.Repository
|
||||||
|
|
||||||
|
for page := 1; ; page++ {
|
||||||
|
repos, _, err := repo_model.SearchRepository(ctx, &repo_model.SearchRepoOptions{
|
||||||
|
ListOptions: db.ListOptions{
|
||||||
|
PageSize: repo_model.RepositoryListDefaultPageSize,
|
||||||
|
Page: page,
|
||||||
|
},
|
||||||
|
Mirror: optional.Some(true),
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("SearchRepository: %w", err)
|
||||||
|
}
|
||||||
|
if len(repos) == 0 {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, repo := range repos {
|
||||||
|
if repo.UnitEnabled(ctx, unit_model.TypeActions) {
|
||||||
|
reposToFix = append(reposToFix, repo)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(reposToFix) == 0 {
|
||||||
|
logger.Info("Found no mirror with actions unit enabled")
|
||||||
|
} else {
|
||||||
|
logger.Warn("Found %d mirrors with actions unit enabled", len(reposToFix))
|
||||||
|
}
|
||||||
|
if !autofix || len(reposToFix) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, repo := range reposToFix {
|
||||||
|
if err := repo_service.UpdateRepositoryUnits(ctx, repo, nil, []unit_model.Type{unit_model.TypeActions}); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
logger.Info("Fixed %d mirrors with actions unit enabled", len(reposToFix))
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
Register(&Check{
|
||||||
|
Title: "Disable the actions unit for all mirrors",
|
||||||
|
Name: "disable-mirror-actions-unit",
|
||||||
|
IsDefault: false,
|
||||||
|
Run: disableMirrorActionsUnit,
|
||||||
|
Priority: 9,
|
||||||
|
})
|
||||||
|
}
|
|
@ -455,7 +455,6 @@ type CreateIssueForm struct {
|
||||||
Ref string `form:"ref"`
|
Ref string `form:"ref"`
|
||||||
MilestoneID int64
|
MilestoneID int64
|
||||||
ProjectID int64
|
ProjectID int64
|
||||||
AssigneeID int64
|
|
||||||
Content string
|
Content string
|
||||||
Files []string
|
Files []string
|
||||||
AllowMaintainerEdit bool
|
AllowMaintainerEdit bool
|
||||||
|
|
|
@ -381,8 +381,13 @@ func CreateRepositoryByExample(ctx context.Context, doer, u *user_model.User, re
|
||||||
|
|
||||||
// insert units for repo
|
// insert units for repo
|
||||||
defaultUnits := unit.DefaultRepoUnits
|
defaultUnits := unit.DefaultRepoUnits
|
||||||
if isFork {
|
switch {
|
||||||
|
case isFork:
|
||||||
defaultUnits = unit.DefaultForkRepoUnits
|
defaultUnits = unit.DefaultForkRepoUnits
|
||||||
|
case repo.IsMirror:
|
||||||
|
defaultUnits = unit.DefaultMirrorRepoUnits
|
||||||
|
case repo.IsTemplate:
|
||||||
|
defaultUnits = unit.DefaultTemplateRepoUnits
|
||||||
}
|
}
|
||||||
units := make([]repo_model.RepoUnit, 0, len(defaultUnits))
|
units := make([]repo_model.RepoUnit, 0, len(defaultUnits))
|
||||||
for _, tp := range defaultUnits {
|
for _, tp := range defaultUnits {
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
<a
|
|
||||||
class="item {{if not .label.IsChecked}}tw-hidden{{end}}"
|
|
||||||
id="label_{{.label.ID}}"
|
|
||||||
href="{{.root.RepoLink}}/{{if or .root.IsPull .root.Issue.IsPull}}pulls{{else}}issues{{end}}?labels={{.label.ID}}"{{/* FIXME: use .root.Issue.Link or create .root.Link */}}
|
|
||||||
>
|
|
||||||
{{- ctx.RenderUtils.RenderLabel .label -}}
|
|
||||||
</a>
|
|
|
@ -1,46 +0,0 @@
|
||||||
<div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-label dropdown">
|
|
||||||
<span class="text muted flex-text-block">
|
|
||||||
<strong>{{ctx.Locale.Tr "repo.issues.new.labels"}}</strong>
|
|
||||||
{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
|
|
||||||
{{svg "octicon-gear" 16 "tw-ml-1"}}
|
|
||||||
{{end}}
|
|
||||||
</span>
|
|
||||||
<div class="filter menu" {{if .Issue}}data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/labels"{{else}}data-id="#label_ids"{{end}}>
|
|
||||||
{{if or .Labels .OrgLabels}}
|
|
||||||
<div class="ui icon search input">
|
|
||||||
<i class="icon">{{svg "octicon-search" 16}}</i>
|
|
||||||
<input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_labels"}}">
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
||||||
<a class="no-select item" href="#">{{ctx.Locale.Tr "repo.issues.new.clear_labels"}}</a>
|
|
||||||
{{if or .Labels .OrgLabels}}
|
|
||||||
{{$previousExclusiveScope := "_no_scope"}}
|
|
||||||
{{range .Labels}}
|
|
||||||
{{$exclusiveScope := .ExclusiveScope}}
|
|
||||||
{{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
|
|
||||||
<div class="divider"></div>
|
|
||||||
{{end}}
|
|
||||||
{{$previousExclusiveScope = $exclusiveScope}}
|
|
||||||
<a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" {{if .IsArchived}}data-is-archived{{end}} data-id-selector="#label_{{.ID}}" data-scope="{{$exclusiveScope}}"><span class="octicon-check {{if not .IsChecked}}tw-invisible{{end}}">{{svg (Iif $exclusiveScope "octicon-dot-fill" "octicon-check")}}</span> {{ctx.RenderUtils.RenderLabel .}}
|
|
||||||
{{if .Description}}<br><small class="desc">{{.Description | ctx.RenderUtils.RenderEmoji}}</small>{{end}}
|
|
||||||
<p class="archived-label-hint">{{template "repo/issue/labels/label_archived" .}}</p>
|
|
||||||
</a>
|
|
||||||
{{end}}
|
|
||||||
<div class="divider"></div>
|
|
||||||
{{$previousExclusiveScope = "_no_scope"}}
|
|
||||||
{{range .OrgLabels}}
|
|
||||||
{{$exclusiveScope := .ExclusiveScope}}
|
|
||||||
{{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
|
|
||||||
<div class="divider"></div>
|
|
||||||
{{end}}
|
|
||||||
{{$previousExclusiveScope = $exclusiveScope}}
|
|
||||||
<a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" {{if .IsArchived}}data-is-archived{{end}} data-id-selector="#label_{{.ID}}" data-scope="{{$exclusiveScope}}"><span class="octicon-check {{if not .IsChecked}}tw-invisible{{end}}">{{svg (Iif $exclusiveScope "octicon-dot-fill" "octicon-check")}}</span> {{ctx.RenderUtils.RenderLabel .}}
|
|
||||||
{{if .Description}}<br><small class="desc">{{.Description | ctx.RenderUtils.RenderEmoji}}</small>{{end}}
|
|
||||||
<p class="archived-label-hint">{{template "repo/issue/labels/label_archived" .}}</p>
|
|
||||||
</a>
|
|
||||||
{{end}}
|
|
||||||
{{else}}
|
|
||||||
<div class="disabled item">{{ctx.Locale.Tr "repo.issues.new.no_items"}}</div>
|
|
||||||
{{end}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
|
@ -1,11 +0,0 @@
|
||||||
<div class="ui labels list">
|
|
||||||
<span class="labels-list">
|
|
||||||
<span class="no-select {{if .root.HasSelectedLabel}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_label"}}</span>
|
|
||||||
{{range .root.Labels}}
|
|
||||||
{{template "repo/issue/labels/label" dict "root" $.root "label" .}}
|
|
||||||
{{end}}
|
|
||||||
{{range .root.OrgLabels}}
|
|
||||||
{{template "repo/issue/labels/label" dict "root" $.root "label" .}}
|
|
||||||
{{end}}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
|
@ -1,38 +0,0 @@
|
||||||
{{if or .OpenMilestones .ClosedMilestones}}
|
|
||||||
<div class="ui icon search input">
|
|
||||||
<i class="icon">{{svg "octicon-search" 16}}</i>
|
|
||||||
<input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_milestones"}}">
|
|
||||||
</div>
|
|
||||||
<div class="divider"></div>
|
|
||||||
{{end}}
|
|
||||||
<div class="no-select item">{{ctx.Locale.Tr "repo.issues.new.clear_milestone"}}</div>
|
|
||||||
{{if and (not .OpenMilestones) (not .ClosedMilestones)}}
|
|
||||||
<div class="disabled item">
|
|
||||||
{{ctx.Locale.Tr "repo.issues.new.no_items"}}
|
|
||||||
</div>
|
|
||||||
{{else}}
|
|
||||||
{{if .OpenMilestones}}
|
|
||||||
<div class="divider"></div>
|
|
||||||
<div class="header">
|
|
||||||
{{ctx.Locale.Tr "repo.issues.new.open_milestone"}}
|
|
||||||
</div>
|
|
||||||
{{range .OpenMilestones}}
|
|
||||||
<a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}">
|
|
||||||
{{svg "octicon-milestone" 16 "tw-mr-1"}}
|
|
||||||
{{.Name}}
|
|
||||||
</a>
|
|
||||||
{{end}}
|
|
||||||
{{end}}
|
|
||||||
{{if .ClosedMilestones}}
|
|
||||||
<div class="divider"></div>
|
|
||||||
<div class="header">
|
|
||||||
{{ctx.Locale.Tr "repo.issues.new.closed_milestone"}}
|
|
||||||
</div>
|
|
||||||
{{range .ClosedMilestones}}
|
|
||||||
<a class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?milestone={{.ID}}">
|
|
||||||
{{svg "octicon-milestone" 16 "tw-mr-1"}}
|
|
||||||
{{.Name}}
|
|
||||||
</a>
|
|
||||||
{{end}}
|
|
||||||
{{end}}
|
|
||||||
{{end}}
|
|
|
@ -18,15 +18,15 @@
|
||||||
<input type="hidden" name="template-file" value="{{.TemplateFile}}">
|
<input type="hidden" name="template-file" value="{{.TemplateFile}}">
|
||||||
{{range .Fields}}
|
{{range .Fields}}
|
||||||
{{if eq .Type "input"}}
|
{{if eq .Type "input"}}
|
||||||
{{template "repo/issue/fields/input" "item" .}}
|
{{template "repo/issue/fields/input" dict "item" .}}
|
||||||
{{else if eq .Type "markdown"}}
|
{{else if eq .Type "markdown"}}
|
||||||
{{template "repo/issue/fields/markdown" "item" .}}
|
{{template "repo/issue/fields/markdown" dict "item" .}}
|
||||||
{{else if eq .Type "textarea"}}
|
{{else if eq .Type "textarea"}}
|
||||||
{{template "repo/issue/fields/textarea" "item" . "root" $}}
|
{{template "repo/issue/fields/textarea" dict "item" . "root" $}}
|
||||||
{{else if eq .Type "dropdown"}}
|
{{else if eq .Type "dropdown"}}
|
||||||
{{template "repo/issue/fields/dropdown" "item" .}}
|
{{template "repo/issue/fields/dropdown" dict "item" .}}
|
||||||
{{else if eq .Type "checkboxes"}}
|
{{else if eq .Type "checkboxes"}}
|
||||||
{{template "repo/issue/fields/checkboxes" "item" .}}
|
{{template "repo/issue/fields/checkboxes" dict "item" .}}
|
||||||
{{end}}
|
{{end}}
|
||||||
{{end}}
|
{{end}}
|
||||||
{{else}}
|
{{else}}
|
||||||
|
@ -49,144 +49,22 @@
|
||||||
<div class="issue-content-right ui segment">
|
<div class="issue-content-right ui segment">
|
||||||
{{template "repo/issue/branch_selector_field" $}}
|
{{template "repo/issue/branch_selector_field" $}}
|
||||||
{{if .PageIsComparePull}}
|
{{if .PageIsComparePull}}
|
||||||
{{template "repo/issue/sidebar/reviewer_list" dict "IssueSidebarReviewersData" $.IssueSidebarReviewersData}}
|
{{template "repo/issue/sidebar/reviewer_list" $.IssuePageMetaData}}
|
||||||
<div class="divider"></div>
|
<div class="divider"></div>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
||||||
<input id="label_ids" name="label_ids" type="hidden" value="{{.label_ids}}">
|
{{template "repo/issue/sidebar/label_list" $.IssuePageMetaData}}
|
||||||
{{template "repo/issue/labels/labels_selector_field" .}}
|
{{template "repo/issue/sidebar/milestone_list" $.IssuePageMetaData}}
|
||||||
{{template "repo/issue/labels/labels_sidebar" dict "root" $}}
|
|
||||||
|
|
||||||
<div class="divider"></div>
|
|
||||||
|
|
||||||
<input id="milestone_id" name="milestone_id" type="hidden" value="{{.milestone_id}}">
|
|
||||||
<div class="ui {{if not .HasIssuesOrPullsWritePermission}}disabled{{end}} floating jump select-milestone dropdown">
|
|
||||||
<span class="text flex-text-block">
|
|
||||||
<strong>{{ctx.Locale.Tr "repo.issues.new.milestone"}}</strong>
|
|
||||||
{{if .HasIssuesOrPullsWritePermission}}
|
|
||||||
{{svg "octicon-gear" 16 "tw-ml-1"}}
|
|
||||||
{{end}}
|
|
||||||
</span>
|
|
||||||
<div class="menu">
|
|
||||||
{{template "repo/issue/milestone/select_menu" .}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="ui select-milestone list">
|
|
||||||
<span class="no-select item {{if .Milestone}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_milestone"}}</span>
|
|
||||||
<div class="selected">
|
|
||||||
{{if .Milestone}}
|
|
||||||
<a class="item muted sidebar-item-link" href="{{.RepoLink}}/issues?milestone={{.Milestone.ID}}">
|
|
||||||
{{svg "octicon-milestone" 18 "tw-mr-2"}}
|
|
||||||
{{.Milestone.Name}}
|
|
||||||
</a>
|
|
||||||
{{end}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{{if .IsProjectsEnabled}}
|
{{if .IsProjectsEnabled}}
|
||||||
<div class="divider"></div>
|
{{template "repo/issue/sidebar/project_list" $.IssuePageMetaData}}
|
||||||
|
|
||||||
<input id="project_id" name="project_id" type="hidden" value="{{.project_id}}">
|
|
||||||
<div class="ui {{if not .HasIssuesOrPullsWritePermission}}disabled{{end}} floating jump select-project dropdown">
|
|
||||||
<span class="text flex-text-block">
|
|
||||||
<strong>{{ctx.Locale.Tr "repo.issues.new.projects"}}</strong>
|
|
||||||
{{if .HasIssuesOrPullsWritePermission}}
|
|
||||||
{{svg "octicon-gear" 16 "tw-ml-1"}}
|
|
||||||
{{end}}
|
|
||||||
</span>
|
|
||||||
<div class="menu">
|
|
||||||
{{if or .OpenProjects .ClosedProjects}}
|
|
||||||
<div class="ui icon search input">
|
|
||||||
<i class="icon">{{svg "octicon-search" 16}}</i>
|
|
||||||
<input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_projects"}}">
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
||||||
<div class="no-select item">{{ctx.Locale.Tr "repo.issues.new.clear_projects"}}</div>
|
|
||||||
{{if and (not .OpenProjects) (not .ClosedProjects)}}
|
|
||||||
<div class="disabled item">
|
|
||||||
{{ctx.Locale.Tr "repo.issues.new.no_items"}}
|
|
||||||
</div>
|
|
||||||
{{else}}
|
|
||||||
{{if .OpenProjects}}
|
|
||||||
<div class="divider"></div>
|
|
||||||
<div class="header">
|
|
||||||
{{ctx.Locale.Tr "repo.issues.new.open_projects"}}
|
|
||||||
</div>
|
|
||||||
{{range .OpenProjects}}
|
|
||||||
<a class="item muted sidebar-item-link" data-id="{{.ID}}" data-href="{{.Link ctx}}">
|
|
||||||
{{svg .IconName 18 "tw-mr-2"}}{{.Title}}
|
|
||||||
</a>
|
|
||||||
{{end}}
|
|
||||||
{{end}}
|
|
||||||
{{if .ClosedProjects}}
|
|
||||||
<div class="divider"></div>
|
|
||||||
<div class="header">
|
|
||||||
{{ctx.Locale.Tr "repo.issues.new.closed_projects"}}
|
|
||||||
</div>
|
|
||||||
{{range .ClosedProjects}}
|
|
||||||
<a class="item muted sidebar-item-link" data-id="{{.ID}}" data-href="{{.Link ctx}}">
|
|
||||||
{{svg .IconName 18 "tw-mr-2"}}{{.Title}}
|
|
||||||
</a>
|
|
||||||
{{end}}
|
|
||||||
{{end}}
|
|
||||||
{{end}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="ui select-project list">
|
|
||||||
<span class="no-select item {{if .Project}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_projects"}}</span>
|
|
||||||
<div class="selected">
|
|
||||||
{{if .Project}}
|
|
||||||
<a class="item muted sidebar-item-link" href="{{.Project.Link ctx}}">
|
|
||||||
{{svg .Project.IconName 18 "tw-mr-2"}}{{.Project.Title}}
|
|
||||||
</a>
|
|
||||||
{{end}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{{end}}
|
{{end}}
|
||||||
<div class="divider"></div>
|
{{template "repo/issue/sidebar/assignee_list" $.IssuePageMetaData}}
|
||||||
<input id="assignee_ids" name="assignee_ids" type="hidden" value="{{.assignee_ids}}">
|
|
||||||
<div class="ui {{if not .HasIssuesOrPullsWritePermission}}disabled{{end}} floating jump select-assignees dropdown">
|
|
||||||
<span class="text flex-text-block">
|
|
||||||
<strong>{{ctx.Locale.Tr "repo.issues.new.assignees"}}</strong>
|
|
||||||
{{if .HasIssuesOrPullsWritePermission}}
|
|
||||||
{{svg "octicon-gear" 16 "tw-ml-1"}}
|
|
||||||
{{end}}
|
|
||||||
</span>
|
|
||||||
<div class="filter menu" data-id="#assignee_ids">
|
|
||||||
<div class="ui icon search input">
|
|
||||||
<i class="icon">{{svg "octicon-search" 16}}</i>
|
|
||||||
<input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_assignees"}}">
|
|
||||||
</div>
|
|
||||||
<div class="no-select item">{{ctx.Locale.Tr "repo.issues.new.clear_assignees"}}</div>
|
|
||||||
{{range .Assignees}}
|
|
||||||
<a class="{{if SliceUtils.Contains $.SelectedAssigneeIDs .ID}}checked{{end}} item muted" href="#" data-id="{{.ID}}" data-id-selector="#assignee_{{.ID}}">
|
|
||||||
<span class="octicon-check {{if not (SliceUtils.Contains $.SelectedAssigneeIDs .ID)}}tw-invisible{{end}}">{{svg "octicon-check"}}</span>
|
|
||||||
<span class="text">
|
|
||||||
{{ctx.AvatarUtils.Avatar . 28 "tw-mr-2"}}{{template "repo/search_name" .}}
|
|
||||||
</span>
|
|
||||||
</a>
|
|
||||||
{{end}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="ui assignees list">
|
|
||||||
<span class="no-select item {{if .HasSelectedAssignee}}tw-hidden{{end}}">
|
|
||||||
{{ctx.Locale.Tr "repo.issues.new.no_assignees"}}
|
|
||||||
</span>
|
|
||||||
<div class="selected">
|
|
||||||
{{range .Assignees}}
|
|
||||||
<a class="item tw-p-1 muted {{if not (SliceUtils.Contains $.SelectedAssigneeIDs .ID)}}tw-hidden{{end}}" id="assignee_{{.ID}}" href="{{$.RepoLink}}/issues?assignee={{.ID}}">
|
|
||||||
{{ctx.AvatarUtils.Avatar . 28 "tw-mr-2 tw-align-middle"}}{{.GetDisplayName}}
|
|
||||||
</a>
|
|
||||||
{{end}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{{if and .PageIsComparePull (not (eq .HeadRepo.FullName .BaseCompareRepo.FullName)) .CanWriteToHeadRepo}}
|
{{if and .PageIsComparePull (not (eq .HeadRepo.FullName .BaseCompareRepo.FullName)) .CanWriteToHeadRepo}}
|
||||||
<div class="divider"></div>
|
<div class="divider"></div>
|
||||||
<div class="inline field">
|
<div class="ui checkbox">
|
||||||
<div class="ui checkbox">
|
<label data-tooltip-content="{{ctx.Locale.Tr "repo.pulls.allow_edits_from_maintainers_desc"}}"><strong>{{ctx.Locale.Tr "repo.pulls.allow_edits_from_maintainers"}}</strong></label>
|
||||||
<label data-tooltip-content="{{ctx.Locale.Tr "repo.pulls.allow_edits_from_maintainers_desc"}}"><strong>{{ctx.Locale.Tr "repo.pulls.allow_edits_from_maintainers"}}</strong></label>
|
<input name="allow_maintainer_edit" type="checkbox" {{if .AllowMaintainerEdit}}checked{{end}}>
|
||||||
<input name="allow_maintainer_edit" type="checkbox" {{if .AllowMaintainerEdit}}checked{{end}}>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
{{end}}
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,46 +1,35 @@
|
||||||
|
{{$pageMeta := .}}
|
||||||
|
{{$data := .AssigneesData}}
|
||||||
|
{{$issueAssignees := NIL}}{{if $pageMeta.Issue}}{{$issueAssignees = $pageMeta.Issue.Assignees}}{{end}}
|
||||||
<div class="divider"></div>
|
<div class="divider"></div>
|
||||||
<input id="assignee_id" name="assignee_id" type="hidden" value="{{.assignee_id}}">
|
<div class="issue-sidebar-combo" data-selection-mode="multiple" data-update-algo="diff"
|
||||||
<div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-assignees-modify dropdown">
|
{{if $pageMeta.Issue}}data-update-url="{{$pageMeta.RepoLink}}/issues/assignee?issue_ids={{$pageMeta.Issue.ID}}"{{end}}
|
||||||
<a class="text muted flex-text-block">
|
>
|
||||||
<strong>{{ctx.Locale.Tr "repo.issues.new.assignees"}}</strong>
|
<input class="combo-value" name="assignee_ids" type="hidden" value="{{$data.SelectedAssigneeIDs}}">
|
||||||
{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
|
<div class="ui dropdown {{if not $pageMeta.CanModifyIssueOrPull}}disabled{{end}}">
|
||||||
{{svg "octicon-gear" 16 "tw-ml-1"}}
|
<a class="text muted">
|
||||||
{{end}}
|
<strong>{{ctx.Locale.Tr "repo.issues.new.assignees"}}</strong> {{if $pageMeta.CanModifyIssueOrPull}}{{svg "octicon-gear"}}{{end}}
|
||||||
</a>
|
</a>
|
||||||
<div class="filter menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/assignee">
|
<div class="menu">
|
||||||
<div class="ui icon search input">
|
<div class="ui icon search input">
|
||||||
<i class="icon">{{svg "octicon-search" 16}}</i>
|
<i class="icon">{{svg "octicon-search" 16}}</i>
|
||||||
<input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_assignees"}}">
|
<input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_assignees"}}">
|
||||||
|
</div>
|
||||||
|
<div class="item clear-selection">{{ctx.Locale.Tr "repo.issues.new.clear_assignees"}}</div>
|
||||||
|
{{range $data.CandidateAssignees}}
|
||||||
|
<a class="item muted" href="#" data-value="{{.ID}}">
|
||||||
|
<span class="item-check-mark">{{svg "octicon-check"}}</span>
|
||||||
|
{{ctx.AvatarUtils.Avatar . 20}} {{template "repo/search_name" .}}
|
||||||
|
</a>
|
||||||
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
<div class="no-select item">{{ctx.Locale.Tr "repo.issues.new.clear_assignees"}}</div>
|
</div>
|
||||||
{{range .Assignees}}
|
<div class="ui list tw-flex tw-flex-row tw-gap-2">
|
||||||
|
<span class="item empty-list {{if $issueAssignees}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_assignees"}}</span>
|
||||||
{{$AssigneeID := .ID}}
|
{{range $issueAssignees}}
|
||||||
<a class="item{{range $.Issue.Assignees}}{{if eq .ID $AssigneeID}} checked{{end}}{{end}}" href="#" data-id="{{.ID}}" data-id-selector="#assignee_{{.ID}}">
|
<a class="item muted" href="{{$pageMeta.RepoLink}}/{{if $pageMeta.IsPullRequest}}pulls{{else}}issues{{end}}?assignee={{.ID}}">
|
||||||
{{$checked := false}}
|
{{ctx.AvatarUtils.Avatar . 20}} {{.GetDisplayName}}
|
||||||
{{range $.Issue.Assignees}}
|
|
||||||
{{if eq .ID $AssigneeID}}
|
|
||||||
{{$checked = true}}
|
|
||||||
{{end}}
|
|
||||||
{{end}}
|
|
||||||
<span class="octicon-check {{if not $checked}}tw-invisible{{end}}">{{svg "octicon-check"}}</span>
|
|
||||||
<span class="text">
|
|
||||||
{{ctx.AvatarUtils.Avatar . 20 "tw-mr-2"}}{{template "repo/search_name" .}}
|
|
||||||
</span>
|
|
||||||
</a>
|
</a>
|
||||||
{{end}}
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="ui assignees list">
|
|
||||||
<span class="no-select item {{if .Issue.Assignees}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_assignees"}}</span>
|
|
||||||
<div class="selected">
|
|
||||||
{{range .Issue.Assignees}}
|
|
||||||
<div class="item">
|
|
||||||
<a class="muted sidebar-item-link" href="{{$.RepoLink}}/{{if $.Issue.IsPull}}pulls{{else}}issues{{end}}?assignee={{.ID}}">
|
|
||||||
{{ctx.AvatarUtils.Avatar . 28 "tw-mr-2"}}
|
|
||||||
{{.GetDisplayName}}
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
53
templates/repo/issue/sidebar/label_list.tmpl
Normal file
53
templates/repo/issue/sidebar/label_list.tmpl
Normal file
|
@ -0,0 +1,53 @@
|
||||||
|
{{$pageMeta := .}}
|
||||||
|
{{$data := .LabelsData}}
|
||||||
|
<div class="issue-sidebar-combo" data-selection-mode="multiple" data-update-algo="diff"
|
||||||
|
{{if $pageMeta.Issue}}data-update-url="{{$pageMeta.RepoLink}}/issues/labels?issue_ids={{$pageMeta.Issue.ID}}"{{end}}
|
||||||
|
>
|
||||||
|
<input class="combo-value" name="label_ids" type="hidden" value="{{$data.SelectedLabelIDs}}">
|
||||||
|
<div class="ui dropdown {{if not $pageMeta.CanModifyIssueOrPull}}disabled{{end}}">
|
||||||
|
<a class="text muted">
|
||||||
|
<strong>{{ctx.Locale.Tr "repo.issues.new.labels"}}</strong> {{if $pageMeta.CanModifyIssueOrPull}}{{svg "octicon-gear"}}{{end}}
|
||||||
|
</a>
|
||||||
|
<div class="menu">
|
||||||
|
{{if not $data.AllLabels}}
|
||||||
|
<div class="item disabled">{{ctx.Locale.Tr "repo.issues.new.no_items"}}</div>
|
||||||
|
{{else}}
|
||||||
|
<div class="ui icon search input">
|
||||||
|
<i class="icon">{{svg "octicon-search" 16}}</i>
|
||||||
|
<input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_labels"}}">
|
||||||
|
</div>
|
||||||
|
<a class="item clear-selection" href="#">{{ctx.Locale.Tr "repo.issues.new.clear_labels"}}</a>
|
||||||
|
{{$previousExclusiveScope := "_no_scope"}}
|
||||||
|
{{range $data.RepoLabels}}
|
||||||
|
{{$exclusiveScope := .ExclusiveScope}}
|
||||||
|
{{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
|
||||||
|
<div class="divider"></div>
|
||||||
|
{{end}}
|
||||||
|
{{$previousExclusiveScope = $exclusiveScope}}
|
||||||
|
{{template "repo/issue/sidebar/label_list_item" dict "Label" .}}
|
||||||
|
{{end}}
|
||||||
|
<div class="divider"></div>
|
||||||
|
{{$previousExclusiveScope = "_no_scope"}}
|
||||||
|
{{range $data.OrgLabels}}
|
||||||
|
{{$exclusiveScope := .ExclusiveScope}}
|
||||||
|
{{if and (ne $previousExclusiveScope "_no_scope") (ne $previousExclusiveScope $exclusiveScope)}}
|
||||||
|
<div class="divider"></div>
|
||||||
|
{{end}}
|
||||||
|
{{$previousExclusiveScope = $exclusiveScope}}
|
||||||
|
{{template "repo/issue/sidebar/label_list_item" dict "Label" .}}
|
||||||
|
{{end}}
|
||||||
|
{{end}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="ui list labels-list tw-my-2 tw-flex tw-gap-2">
|
||||||
|
<span class="item empty-list {{if $data.SelectedLabelIDs}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_label"}}</span>
|
||||||
|
{{range $data.AllLabels}}
|
||||||
|
{{if .IsChecked}}
|
||||||
|
<a class="item" href="{{$pageMeta.RepoLink}}/{{if $pageMeta.IsPullRequest}}pulls{{else}}issues{{end}}?labels={{.ID}}">
|
||||||
|
{{- ctx.RenderUtils.RenderLabel . -}}
|
||||||
|
</a>
|
||||||
|
{{end}}
|
||||||
|
{{end}}
|
||||||
|
</div>
|
||||||
|
</div>
|
11
templates/repo/issue/sidebar/label_list_item.tmpl
Normal file
11
templates/repo/issue/sidebar/label_list_item.tmpl
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
{{$label := .Label}}
|
||||||
|
<a class="item muted {{if $label.IsChecked}}checked{{else if $label.IsArchived}}tw-hidden{{end}}" href="#"
|
||||||
|
data-scope="{{$label.ExclusiveScope}}" data-value="{{$label.ID}}" {{if $label.IsArchived}}data-is-archived{{end}}
|
||||||
|
>
|
||||||
|
<span class="item-check-mark">{{svg (Iif $label.ExclusiveScope "octicon-dot-fill" "octicon-check")}}</span>
|
||||||
|
{{ctx.RenderUtils.RenderLabel $label}}
|
||||||
|
<div class="item-secondary-info">
|
||||||
|
{{if $label.Description}}<div class="tw-pl-[20px]"><small>{{$label.Description | ctx.RenderUtils.RenderEmoji}}</small></div>{{end}}
|
||||||
|
<div class="archived-label-hint">{{template "repo/issue/labels/label_archived" $label}}</div>
|
||||||
|
</div>
|
||||||
|
</a>
|
|
@ -1,22 +1,52 @@
|
||||||
|
{{$pageMeta := .}}
|
||||||
|
{{$data := .MilestonesData}}
|
||||||
|
{{$issueMilestone := NIL}}{{if and $pageMeta.Issue $pageMeta.Issue.Milestone}}{{$issueMilestone = $pageMeta.Issue.Milestone}}{{end}}
|
||||||
<div class="divider"></div>
|
<div class="divider"></div>
|
||||||
<div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-milestone dropdown">
|
<div class="issue-sidebar-combo" data-selection-mode="single" data-update-algo="all"
|
||||||
<a class="text muted flex-text-block">
|
{{if $pageMeta.Issue}}data-update-url="{{$pageMeta.RepoLink}}/issues/milestone?issue_ids={{$pageMeta.Issue.ID}}"{{end}}
|
||||||
<strong>{{ctx.Locale.Tr "repo.issues.new.milestone"}}</strong>
|
>
|
||||||
{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
|
<input class="combo-value" name="milestone_id" type="hidden" value="{{$data.SelectedMilestoneID}}">
|
||||||
{{svg "octicon-gear" 16 "tw-ml-1"}}
|
<div class="ui dropdown {{if not $pageMeta.CanModifyIssueOrPull}}disabled{{end}} ">
|
||||||
{{end}}
|
<a class="text muted">
|
||||||
</a>
|
<strong>{{ctx.Locale.Tr "repo.issues.new.milestone"}}</strong> {{if $pageMeta.CanModifyIssueOrPull}}{{svg "octicon-gear"}}{{end}}
|
||||||
<div class="menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/milestone">
|
</a>
|
||||||
{{template "repo/issue/milestone/select_menu" .}}
|
<div class="menu">
|
||||||
|
{{if and (not $data.OpenMilestones) (not $data.ClosedMilestones)}}
|
||||||
|
<div class="item disabled">{{ctx.Locale.Tr "repo.issues.new.no_items"}}</div>
|
||||||
|
{{else}}
|
||||||
|
<div class="ui icon search input">
|
||||||
|
<i class="icon">{{svg "octicon-search"}}</i>
|
||||||
|
<input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_milestones"}}">
|
||||||
|
</div>
|
||||||
|
<div class="divider"></div>
|
||||||
|
<div class="item clear-selection">{{ctx.Locale.Tr "repo.issues.new.clear_milestone"}}</div>
|
||||||
|
{{if $data.OpenMilestones}}
|
||||||
|
<div class="divider"></div>
|
||||||
|
<div class="header">{{ctx.Locale.Tr "repo.issues.new.open_milestone"}}</div>
|
||||||
|
{{range $data.OpenMilestones}}
|
||||||
|
<a class="item muted" data-value="{{.ID}}" href="{{$pageMeta.RepoLink}}/issues?milestone={{.ID}}">
|
||||||
|
{{svg "octicon-milestone" 18}} {{.Name}}
|
||||||
|
</a>
|
||||||
|
{{end}}
|
||||||
|
{{end}}
|
||||||
|
{{if $data.ClosedMilestones}}
|
||||||
|
<div class="divider"></div>
|
||||||
|
<div class="header">{{ctx.Locale.Tr "repo.issues.new.closed_milestone"}}</div>
|
||||||
|
{{range $data.ClosedMilestones}}
|
||||||
|
<a class="item muted" data-value="{{.ID}}" href="{{$pageMeta.RepoLink}}/issues?milestone={{.ID}}">
|
||||||
|
{{svg "octicon-milestone" 18}} {{.Name}}
|
||||||
|
</a>
|
||||||
|
{{end}}
|
||||||
|
{{end}}
|
||||||
|
{{end}}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
<div class="ui select-milestone list">
|
<div class="ui list">
|
||||||
<span class="no-select item {{if .Issue.Milestone}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_milestone"}}</span>
|
<span class="item empty-list {{if $issueMilestone}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_milestone"}}</span>
|
||||||
<div class="selected">
|
{{if $issueMilestone}}
|
||||||
{{if .Issue.Milestone}}
|
<a class="item muted" href="{{$pageMeta.RepoLink}}/milestone/{{$issueMilestone.ID}}">
|
||||||
<a class="item muted sidebar-item-link" href="{{.RepoLink}}/milestone/{{.Issue.Milestone.ID}}">
|
{{svg "octicon-milestone" 18}} {{$issueMilestone.Name}}
|
||||||
{{svg "octicon-milestone" 18 "tw-mr-2"}}
|
|
||||||
{{.Issue.Milestone.Name}}
|
|
||||||
</a>
|
</a>
|
||||||
{{end}}
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
<div class="ui list tw-flex tw-flex-wrap">
|
<div class="ui list tw-flex tw-flex-wrap">
|
||||||
{{range .Participants}}
|
{{range .Participants}}
|
||||||
<a {{if gt .ID 0}}href="{{.HomeLink}}"{{end}} data-tooltip-content="{{.GetDisplayName}}">
|
<a {{if gt .ID 0}}href="{{.HomeLink}}"{{end}} data-tooltip-content="{{.GetDisplayName}}">
|
||||||
{{ctx.AvatarUtils.Avatar . 28 "tw-my-0.5 tw-mr-1"}}
|
{{ctx.AvatarUtils.Avatar . 20 "tw-my-0.5 tw-mr-1"}}
|
||||||
</a>
|
</a>
|
||||||
{{end}}
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,53 +1,49 @@
|
||||||
{{if .IsProjectsEnabled}}
|
{{$pageMeta := .}}
|
||||||
<div class="divider"></div>
|
{{$data := .ProjectsData}}
|
||||||
|
{{$issueProject := NIL}}{{if and $pageMeta.Issue $pageMeta.Issue.Project}}{{$issueProject = $pageMeta.Issue.Project}}{{end}}
|
||||||
<div class="ui {{if or (not .HasIssuesOrPullsWritePermission) .Repository.IsArchived}}disabled{{end}} floating jump select-project dropdown">
|
<div class="divider"></div>
|
||||||
<a class="text muted flex-text-block">
|
<div class="issue-sidebar-combo" data-selection-mode="single" data-update-algo="all"
|
||||||
<strong>{{ctx.Locale.Tr "repo.issues.new.projects"}}</strong>
|
{{if $pageMeta.Issue}}data-update-url="{{$pageMeta.RepoLink}}/issues/projects?issue_ids={{$pageMeta.Issue.ID}}"{{end}}
|
||||||
{{if and .HasIssuesOrPullsWritePermission (not .Repository.IsArchived)}}
|
>
|
||||||
{{svg "octicon-gear" 16 "tw-ml-1"}}
|
<input class="combo-value" name="project_id" type="hidden" value="{{$data.SelectedProjectID}}">
|
||||||
{{end}}
|
<div class="ui dropdown {{if not $pageMeta.CanModifyIssueOrPull}}disabled{{end}}">
|
||||||
|
<a class="text muted">
|
||||||
|
<strong>{{ctx.Locale.Tr "repo.issues.new.projects"}}</strong> {{if $pageMeta.CanModifyIssueOrPull}}{{svg "octicon-gear"}}{{end}}
|
||||||
</a>
|
</a>
|
||||||
<div class="menu" data-action="update" data-issue-id="{{$.Issue.ID}}" data-update-url="{{$.RepoLink}}/issues/projects">
|
<div class="menu">
|
||||||
{{if or .OpenProjects .ClosedProjects}}
|
{{if or $data.OpenProjects $data.ClosedProjects}}
|
||||||
<div class="ui icon search input">
|
<div class="ui icon search input">
|
||||||
<i class="icon">{{svg "octicon-search" 16}}</i>
|
<i class="icon">{{svg "octicon-search" 16}}</i>
|
||||||
<input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_projects"}}">
|
<input type="text" placeholder="{{ctx.Locale.Tr "repo.issues.filter_projects"}}">
|
||||||
</div>
|
</div>
|
||||||
{{end}}
|
{{end}}
|
||||||
<div class="no-select item">{{ctx.Locale.Tr "repo.issues.new.clear_projects"}}</div>
|
<div class="item clear-selection">{{ctx.Locale.Tr "repo.issues.new.clear_projects"}}</div>
|
||||||
{{if .OpenProjects}}
|
{{if $data.OpenProjects}}
|
||||||
<div class="divider"></div>
|
<div class="divider"></div>
|
||||||
<div class="header">
|
<div class="header">{{ctx.Locale.Tr "repo.issues.new.open_projects"}}</div>
|
||||||
{{ctx.Locale.Tr "repo.issues.new.open_projects"}}
|
{{range $data.OpenProjects}}
|
||||||
</div>
|
<a class="item muted" data-value="{{.ID}}" href="{{.Link ctx}}">
|
||||||
{{range .OpenProjects}}
|
{{svg .IconName 18}} {{.Title}}
|
||||||
<a class="item muted sidebar-item-link" data-id="{{.ID}}" data-href="{{.Link ctx}}">
|
|
||||||
{{svg .IconName 18 "tw-mr-2"}}{{.Title}}
|
|
||||||
</a>
|
</a>
|
||||||
{{end}}
|
{{end}}
|
||||||
{{end}}
|
{{end}}
|
||||||
{{if .ClosedProjects}}
|
{{if $data.ClosedProjects}}
|
||||||
<div class="divider"></div>
|
<div class="divider"></div>
|
||||||
<div class="header">
|
<div class="header">{{ctx.Locale.Tr "repo.issues.new.closed_projects"}}</div>
|
||||||
{{ctx.Locale.Tr "repo.issues.new.closed_projects"}}
|
{{range $data.ClosedProjects}}
|
||||||
</div>
|
<a class="item muted" data-value="{{.ID}}" href="{{.Link ctx}}">
|
||||||
{{range .ClosedProjects}}
|
{{svg .IconName 18}} {{.Title}}
|
||||||
<a class="item muted sidebar-item-link" data-id="{{.ID}}" data-href="{{.Link ctx}}">
|
|
||||||
{{svg .IconName 18 "tw-mr-2"}}{{.Title}}
|
|
||||||
</a>
|
</a>
|
||||||
{{end}}
|
{{end}}
|
||||||
{{end}}
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="ui select-project list">
|
<div class="ui list">
|
||||||
<span class="no-select item {{if .Issue.Project}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_projects"}}</span>
|
<span class="item empty-list {{if $issueProject}}tw-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_projects"}}</span>
|
||||||
<div class="selected">
|
{{if $issueProject}}
|
||||||
{{if .Issue.Project}}
|
<a class="item muted" href="{{$issueProject.Link ctx}}">
|
||||||
<a class="item muted sidebar-item-link" href="{{.Issue.Project.Link ctx}}">
|
{{svg $issueProject.IconName 18}} {{$issueProject.Title}}
|
||||||
{{svg .Issue.Project.IconName 18 "tw-mr-2"}}{{.Issue.Project.Title}}
|
</a>
|
||||||
</a>
|
{{end}}
|
||||||
{{end}}
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
{{end}}
|
</div>
|
||||||
|
|
|
@ -1,12 +1,14 @@
|
||||||
{{$data := .IssueSidebarReviewersData}}
|
{{$pageMeta := .}}
|
||||||
|
{{$data := .ReviewersData}}
|
||||||
|
{{$repoOwnerName := $pageMeta.Repository.OwnerName}}
|
||||||
{{$hasCandidates := or $data.Reviewers $data.TeamReviewers}}
|
{{$hasCandidates := or $data.Reviewers $data.TeamReviewers}}
|
||||||
<div class="issue-sidebar-combo" data-sidebar-combo-for="reviewers"
|
<div class="issue-sidebar-combo" data-selection-mode="multiple" data-update-algo="diff"
|
||||||
{{if $data.IssueID}}data-update-url="{{$data.RepoLink}}/issues/request_review?issue_ids={{$data.IssueID}}"{{end}}
|
{{if $pageMeta.Issue}}data-update-url="{{$pageMeta.RepoLink}}/issues/request_review?issue_ids={{$pageMeta.Issue.ID}}"{{end}}
|
||||||
>
|
>
|
||||||
<input type="hidden" class="combo-value" name="reviewer_ids">{{/* match CreateIssueForm */}}
|
<input type="hidden" class="combo-value" name="reviewer_ids">{{/* match CreateIssueForm */}}
|
||||||
<div class="ui dropdown custom {{if or (not $hasCandidates) (not $data.CanChooseReviewer)}}disabled{{end}}">
|
<div class="ui dropdown {{if or (not $hasCandidates) (not $data.CanChooseReviewer)}}disabled{{end}}">
|
||||||
<a class="muted text">
|
<a class="text muted">
|
||||||
<strong>{{ctx.Locale.Tr "repo.issues.review.reviewers"}}</strong> {{if and $data.CanChooseReviewer}}{{svg "octicon-gear"}}{{end}}
|
<strong>{{ctx.Locale.Tr "repo.issues.review.reviewers"}}</strong> {{if $data.CanChooseReviewer}}{{svg "octicon-gear"}}{{end}}
|
||||||
</a>
|
</a>
|
||||||
<div class="menu flex-items-menu">
|
<div class="menu flex-items-menu">
|
||||||
{{if $hasCandidates}}
|
{{if $hasCandidates}}
|
||||||
|
@ -19,7 +21,8 @@
|
||||||
{{if .User}}
|
{{if .User}}
|
||||||
<a class="item muted {{if .Requested}}checked{{end}}" href="{{.User.HomeLink}}" data-value="{{.ItemID}}" data-can-change="{{.CanChange}}"
|
<a class="item muted {{if .Requested}}checked{{end}}" href="{{.User.HomeLink}}" data-value="{{.ItemID}}" data-can-change="{{.CanChange}}"
|
||||||
{{if not .CanChange}}data-tooltip-content="{{ctx.Locale.Tr "repo.issues.remove_request_review_block"}}"{{end}}>
|
{{if not .CanChange}}data-tooltip-content="{{ctx.Locale.Tr "repo.issues.remove_request_review_block"}}"{{end}}>
|
||||||
{{svg "octicon-check"}} {{ctx.AvatarUtils.Avatar .User 20}} {{template "repo/search_name" .User}}
|
<span class="item-check-mark">{{svg "octicon-check"}}</span>
|
||||||
|
{{ctx.AvatarUtils.Avatar .User 20}} {{template "repo/search_name" .User}}
|
||||||
</a>
|
</a>
|
||||||
{{end}}
|
{{end}}
|
||||||
{{end}}
|
{{end}}
|
||||||
|
@ -29,7 +32,8 @@
|
||||||
{{if .Team}}
|
{{if .Team}}
|
||||||
<a class="item muted {{if .Requested}}checked{{end}}" href="#" data-value="{{.ItemID}}" data-can-change="{{.CanChange}}"
|
<a class="item muted {{if .Requested}}checked{{end}}" href="#" data-value="{{.ItemID}}" data-can-change="{{.CanChange}}"
|
||||||
{{if not .CanChange}} data-tooltip-content="{{ctx.Locale.Tr "repo.issues.remove_request_review_block"}}"{{end}}>
|
{{if not .CanChange}} data-tooltip-content="{{ctx.Locale.Tr "repo.issues.remove_request_review_block"}}"{{end}}>
|
||||||
{{svg "octicon-check"}} {{svg "octicon-people" 20}} {{$data.RepoOwnerName}}/{{.Team.Name}}
|
<span class="item-check-mark">{{svg "octicon-check"}}</span>
|
||||||
|
{{svg "octicon-people" 20}} {{$repoOwnerName}}/{{.Team.Name}}
|
||||||
</a>
|
</a>
|
||||||
{{end}}
|
{{end}}
|
||||||
{{end}}
|
{{end}}
|
||||||
|
@ -47,7 +51,7 @@
|
||||||
{{if .User}}
|
{{if .User}}
|
||||||
<a class="muted flex-text-inline" href="{{.User.HomeLink}}">{{ctx.AvatarUtils.Avatar .User 20}} {{.User.GetDisplayName}}</a>
|
<a class="muted flex-text-inline" href="{{.User.HomeLink}}">{{ctx.AvatarUtils.Avatar .User 20}} {{.User.GetDisplayName}}</a>
|
||||||
{{else if .Team}}
|
{{else if .Team}}
|
||||||
{{svg "octicon-people" 20}} {{$data.RepoOwnerName}}/{{.Team.Name}}
|
{{svg "octicon-people" 20}} {{$repoOwnerName}}/{{.Team.Name}}
|
||||||
{{end}}
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
<div class="flex-text-inline">
|
<div class="flex-text-inline">
|
||||||
|
@ -64,13 +68,13 @@
|
||||||
{{if .Requested}}
|
{{if .Requested}}
|
||||||
<a href="#" class="ui muted icon link-action"
|
<a href="#" class="ui muted icon link-action"
|
||||||
data-tooltip-content="{{ctx.Locale.Tr "repo.issues.remove_request_review"}}"
|
data-tooltip-content="{{ctx.Locale.Tr "repo.issues.remove_request_review"}}"
|
||||||
data-url="{{$data.RepoLink}}/issues/request_review?action=detach&issue_ids={{$data.IssueID}}&id={{.ItemID}}">
|
data-url="{{$pageMeta.RepoLink}}/issues/request_review?action=detach&issue_ids={{$pageMeta.Issue.ID}}&id={{.ItemID}}">
|
||||||
{{svg "octicon-trash"}}
|
{{svg "octicon-trash"}}
|
||||||
</a>
|
</a>
|
||||||
{{else}}
|
{{else}}
|
||||||
<a href="#" class="ui muted icon link-action"
|
<a href="#" class="ui muted icon link-action"
|
||||||
data-tooltip-content="{{ctx.Locale.Tr "repo.issues.re_request_review"}}"
|
data-tooltip-content="{{ctx.Locale.Tr "repo.issues.re_request_review"}}"
|
||||||
data-url="{{$data.RepoLink}}/issues/request_review?action=attach&issue_ids={{$data.IssueID}}&id={{.ItemID}}">
|
data-url="{{$pageMeta.RepoLink}}/issues/request_review?action=attach&issue_ids={{$pageMeta.Issue.ID}}&id={{.ItemID}}">
|
||||||
{{svg "octicon-sync"}}
|
{{svg "octicon-sync"}}
|
||||||
</a>
|
</a>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
@ -84,8 +88,8 @@
|
||||||
{{range $data.OriginalReviews}}
|
{{range $data.OriginalReviews}}
|
||||||
<div class="item">
|
<div class="item">
|
||||||
<div class="flex-text-inline tw-flex-1">
|
<div class="flex-text-inline tw-flex-1">
|
||||||
{{$originalURLHostname := $data.Repository.GetOriginalURLHostname}}
|
{{$originalURLHostname := $pageMeta.Repository.GetOriginalURLHostname}}
|
||||||
{{$originalURL := $data.Repository.OriginalURL}}
|
{{$originalURL := $pageMeta.Repository.OriginalURL}}
|
||||||
<a class="muted flex-text-inline" href="{{$originalURL}}" data-tooltip-content="{{ctx.Locale.Tr "repo.migrated_from_fake" $originalURLHostname}}">
|
<a class="muted flex-text-inline" href="{{$originalURL}}" data-tooltip-content="{{ctx.Locale.Tr "repo.migrated_from_fake" $originalURLHostname}}">
|
||||||
{{svg (MigrationIcon $originalURLHostname) 20}} {{.OriginalAuthor}}
|
{{svg (MigrationIcon $originalURLHostname) 20}} {{.OriginalAuthor}}
|
||||||
</a>
|
</a>
|
||||||
|
@ -108,7 +112,7 @@
|
||||||
<div class="ui warning message">
|
<div class="ui warning message">
|
||||||
{{ctx.Locale.Tr "repo.issues.dismiss_review_warning"}}
|
{{ctx.Locale.Tr "repo.issues.dismiss_review_warning"}}
|
||||||
</div>
|
</div>
|
||||||
<form class="ui form" action="{{$data.RepoLink}}/issues/dismiss_review" method="post">
|
<form class="ui form" action="{{$pageMeta.RepoLink}}/issues/dismiss_review" method="post">
|
||||||
{{ctx.RootData.CsrfTokenHtml}}
|
{{ctx.RootData.CsrfTokenHtml}}
|
||||||
<input type="hidden" class="reviewer-id" name="review_id">
|
<input type="hidden" class="reviewer-id" name="review_id">
|
||||||
<div class="field">
|
<div class="field">
|
||||||
|
|
|
@ -2,17 +2,19 @@
|
||||||
{{template "repo/issue/branch_selector_field" $}}
|
{{template "repo/issue/branch_selector_field" $}}
|
||||||
|
|
||||||
{{if .Issue.IsPull}}
|
{{if .Issue.IsPull}}
|
||||||
{{template "repo/issue/sidebar/reviewer_list" dict "IssueSidebarReviewersData" $.IssueSidebarReviewersData}}
|
{{template "repo/issue/sidebar/reviewer_list" $.IssuePageMetaData}}
|
||||||
{{template "repo/issue/sidebar/wip_switch" $}}
|
{{template "repo/issue/sidebar/wip_switch" $}}
|
||||||
<div class="divider"></div>
|
<div class="divider"></div>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
||||||
{{template "repo/issue/labels/labels_selector_field" $}}
|
{{template "repo/issue/sidebar/label_list" $.IssuePageMetaData}}
|
||||||
{{template "repo/issue/labels/labels_sidebar" dict "root" $}}
|
|
||||||
|
{{template "repo/issue/sidebar/milestone_list" $.IssuePageMetaData}}
|
||||||
|
{{if .IsProjectsEnabled}}
|
||||||
|
{{template "repo/issue/sidebar/project_list" $.IssuePageMetaData}}
|
||||||
|
{{end}}
|
||||||
|
{{template "repo/issue/sidebar/assignee_list" $.IssuePageMetaData}}
|
||||||
|
|
||||||
{{template "repo/issue/sidebar/milestone_list" $}}
|
|
||||||
{{template "repo/issue/sidebar/project_list" $}}
|
|
||||||
{{template "repo/issue/sidebar/assignee_list" $}}
|
|
||||||
{{template "repo/issue/sidebar/participant_list" $}}
|
{{template "repo/issue/sidebar/participant_list" $}}
|
||||||
{{template "repo/issue/sidebar/watch_notification" $}}
|
{{template "repo/issue/sidebar/watch_notification" $}}
|
||||||
{{template "repo/issue/sidebar/stopwatch_timetracker" $}}
|
{{template "repo/issue/sidebar/stopwatch_timetracker" $}}
|
||||||
|
|
|
@ -50,7 +50,7 @@
|
||||||
width: 300px;
|
width: 300px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.issue-sidebar-combo .ui.dropdown .item:not(.checked) svg.octicon-check {
|
.issue-sidebar-combo .ui.dropdown .item:not(.checked) .item-check-mark {
|
||||||
visibility: hidden;
|
visibility: hidden;
|
||||||
}
|
}
|
||||||
/* ideally, we should move these styles to ".ui.dropdown .menu.flex-items-menu > .item ...", could be done later */
|
/* ideally, we should move these styles to ".ui.dropdown .menu.flex-items-menu > .item ...", could be done later */
|
||||||
|
@ -62,6 +62,8 @@
|
||||||
.issue-content-right .dropdown > .menu {
|
.issue-content-right .dropdown > .menu {
|
||||||
max-width: 270px;
|
max-width: 270px;
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
|
max-height: 500px;
|
||||||
|
overflow-x: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: 767.98px) {
|
@media (max-width: 767.98px) {
|
||||||
|
@ -110,10 +112,6 @@
|
||||||
left: 0;
|
left: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.repository .select-label .desc {
|
|
||||||
padding-left: 23px;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* For the secondary pointing menu, respect its own border-bottom */
|
/* For the secondary pointing menu, respect its own border-bottom */
|
||||||
/* style reference: https://semantic-ui.com/collections/menu.html#pointing */
|
/* style reference: https://semantic-ui.com/collections/menu.html#pointing */
|
||||||
.repository .ui.tabs.container .ui.menu:not(.secondary.pointing) {
|
.repository .ui.tabs.container .ui.menu:not(.secondary.pointing) {
|
||||||
|
@ -2455,12 +2453,6 @@ tbody.commit-list {
|
||||||
margin-top: 1em;
|
margin-top: 1em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.sidebar-item-link {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
overflow-wrap: anywhere;
|
|
||||||
}
|
|
||||||
|
|
||||||
.diff-file-header {
|
.diff-file-header {
|
||||||
padding: 5px 8px !important;
|
padding: 5px 8px !important;
|
||||||
box-shadow: 0 -1px 0 1px var(--color-body); /* prevent borders being visible behind top corners when sticky and scrolled */
|
box-shadow: 0 -1px 0 1px var(--color-body); /* prevent borders being visible behind top corners when sticky and scrolled */
|
||||||
|
|
|
@ -47,6 +47,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.archived-label-hint {
|
.archived-label-hint {
|
||||||
float: right;
|
position: absolute;
|
||||||
margin: -12px;
|
top: 10px;
|
||||||
|
right: 5px;
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,15 +5,15 @@ import {POST} from '../../modules/fetch.ts';
|
||||||
|
|
||||||
const {appSubUrl} = window.config;
|
const {appSubUrl} = window.config;
|
||||||
|
|
||||||
function onSecurityProtocolChange() {
|
function onSecurityProtocolChange(): void {
|
||||||
if (Number(document.querySelector('#security_protocol')?.value) > 0) {
|
if (Number(document.querySelector<HTMLInputElement>('#security_protocol')?.value) > 0) {
|
||||||
showElem('.has-tls');
|
showElem('.has-tls');
|
||||||
} else {
|
} else {
|
||||||
hideElem('.has-tls');
|
hideElem('.has-tls');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export function initAdminCommon() {
|
export function initAdminCommon(): void {
|
||||||
if (!document.querySelector('.page-content.admin')) return;
|
if (!document.querySelector('.page-content.admin')) return;
|
||||||
|
|
||||||
// check whether appUrl(ROOT_URL) is correct, if not, show an error message
|
// check whether appUrl(ROOT_URL) is correct, if not, show an error message
|
||||||
|
@ -21,34 +21,34 @@ export function initAdminCommon() {
|
||||||
|
|
||||||
// New user
|
// New user
|
||||||
if ($('.admin.new.user').length > 0 || $('.admin.edit.user').length > 0) {
|
if ($('.admin.new.user').length > 0 || $('.admin.edit.user').length > 0) {
|
||||||
document.querySelector('#login_type')?.addEventListener('change', function () {
|
document.querySelector<HTMLInputElement>('#login_type')?.addEventListener('change', function () {
|
||||||
if (this.value?.substring(0, 1) === '0') {
|
if (this.value?.startsWith('0')) {
|
||||||
document.querySelector('#user_name')?.removeAttribute('disabled');
|
document.querySelector<HTMLInputElement>('#user_name')?.removeAttribute('disabled');
|
||||||
document.querySelector('#login_name')?.removeAttribute('required');
|
document.querySelector<HTMLInputElement>('#login_name')?.removeAttribute('required');
|
||||||
hideElem('.non-local');
|
hideElem('.non-local');
|
||||||
showElem('.local');
|
showElem('.local');
|
||||||
document.querySelector('#user_name')?.focus();
|
document.querySelector<HTMLInputElement>('#user_name')?.focus();
|
||||||
|
|
||||||
if (this.getAttribute('data-password') === 'required') {
|
if (this.getAttribute('data-password') === 'required') {
|
||||||
document.querySelector('#password')?.setAttribute('required', 'required');
|
document.querySelector('#password')?.setAttribute('required', 'required');
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (document.querySelector('.admin.edit.user')) {
|
if (document.querySelector<HTMLDivElement>('.admin.edit.user')) {
|
||||||
document.querySelector('#user_name')?.setAttribute('disabled', 'disabled');
|
document.querySelector<HTMLInputElement>('#user_name')?.setAttribute('disabled', 'disabled');
|
||||||
}
|
}
|
||||||
document.querySelector('#login_name')?.setAttribute('required', 'required');
|
document.querySelector<HTMLInputElement>('#login_name')?.setAttribute('required', 'required');
|
||||||
showElem('.non-local');
|
showElem('.non-local');
|
||||||
hideElem('.local');
|
hideElem('.local');
|
||||||
document.querySelector('#login_name')?.focus();
|
document.querySelector<HTMLInputElement>('#login_name')?.focus();
|
||||||
|
|
||||||
document.querySelector('#password')?.removeAttribute('required');
|
document.querySelector<HTMLInputElement>('#password')?.removeAttribute('required');
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function onUsePagedSearchChange() {
|
function onUsePagedSearchChange() {
|
||||||
const searchPageSizeElements = document.querySelectorAll('.search-page-size');
|
const searchPageSizeElements = document.querySelectorAll<HTMLDivElement>('.search-page-size');
|
||||||
if (document.querySelector('#use_paged_search').checked) {
|
if (document.querySelector<HTMLInputElement>('#use_paged_search').checked) {
|
||||||
showElem('.search-page-size');
|
showElem('.search-page-size');
|
||||||
for (const el of searchPageSizeElements) {
|
for (const el of searchPageSizeElements) {
|
||||||
el.querySelector('input')?.setAttribute('required', 'required');
|
el.querySelector('input')?.setAttribute('required', 'required');
|
||||||
|
@ -61,20 +61,20 @@ export function initAdminCommon() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function onOAuth2Change(applyDefaultValues) {
|
function onOAuth2Change(applyDefaultValues: boolean) {
|
||||||
hideElem('.open_id_connect_auto_discovery_url, .oauth2_use_custom_url');
|
hideElem('.open_id_connect_auto_discovery_url, .oauth2_use_custom_url');
|
||||||
for (const input of document.querySelectorAll('.open_id_connect_auto_discovery_url input[required]')) {
|
for (const input of document.querySelectorAll<HTMLInputElement>('.open_id_connect_auto_discovery_url input[required]')) {
|
||||||
input.removeAttribute('required');
|
input.removeAttribute('required');
|
||||||
}
|
}
|
||||||
|
|
||||||
const provider = document.querySelector('#oauth2_provider').value;
|
const provider = document.querySelector<HTMLInputElement>('#oauth2_provider').value;
|
||||||
switch (provider) {
|
switch (provider) {
|
||||||
case 'openidConnect':
|
case 'openidConnect':
|
||||||
document.querySelector('.open_id_connect_auto_discovery_url input').setAttribute('required', 'required');
|
document.querySelector<HTMLInputElement>('.open_id_connect_auto_discovery_url input').setAttribute('required', 'required');
|
||||||
showElem('.open_id_connect_auto_discovery_url');
|
showElem('.open_id_connect_auto_discovery_url');
|
||||||
break;
|
break;
|
||||||
default: {
|
default: {
|
||||||
const elProviderCustomUrlSettings = document.querySelector(`#${provider}_customURLSettings`);
|
const elProviderCustomUrlSettings = document.querySelector<HTMLInputElement>(`#${provider}_customURLSettings`);
|
||||||
if (!elProviderCustomUrlSettings) break; // some providers do not have custom URL settings
|
if (!elProviderCustomUrlSettings) break; // some providers do not have custom URL settings
|
||||||
const couldChangeCustomURLs = elProviderCustomUrlSettings.getAttribute('data-available') === 'true';
|
const couldChangeCustomURLs = elProviderCustomUrlSettings.getAttribute('data-available') === 'true';
|
||||||
const mustProvideCustomURLs = elProviderCustomUrlSettings.getAttribute('data-required') === 'true';
|
const mustProvideCustomURLs = elProviderCustomUrlSettings.getAttribute('data-required') === 'true';
|
||||||
|
@ -82,7 +82,7 @@ export function initAdminCommon() {
|
||||||
showElem('.oauth2_use_custom_url'); // show the checkbox
|
showElem('.oauth2_use_custom_url'); // show the checkbox
|
||||||
}
|
}
|
||||||
if (mustProvideCustomURLs) {
|
if (mustProvideCustomURLs) {
|
||||||
document.querySelector('#oauth2_use_custom_url').checked = true; // make the checkbox checked
|
document.querySelector<HTMLInputElement>('#oauth2_use_custom_url').checked = true; // make the checkbox checked
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -91,17 +91,17 @@ export function initAdminCommon() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function onOAuth2UseCustomURLChange(applyDefaultValues) {
|
function onOAuth2UseCustomURLChange(applyDefaultValues) {
|
||||||
const provider = document.querySelector('#oauth2_provider').value;
|
const provider = document.querySelector<HTMLInputElement>('#oauth2_provider').value;
|
||||||
hideElem('.oauth2_use_custom_url_field');
|
hideElem('.oauth2_use_custom_url_field');
|
||||||
for (const input of document.querySelectorAll('.oauth2_use_custom_url_field input[required]')) {
|
for (const input of document.querySelectorAll<HTMLInputElement>('.oauth2_use_custom_url_field input[required]')) {
|
||||||
input.removeAttribute('required');
|
input.removeAttribute('required');
|
||||||
}
|
}
|
||||||
|
|
||||||
const elProviderCustomUrlSettings = document.querySelector(`#${provider}_customURLSettings`);
|
const elProviderCustomUrlSettings = document.querySelector(`#${provider}_customURLSettings`);
|
||||||
if (elProviderCustomUrlSettings && document.querySelector('#oauth2_use_custom_url').checked) {
|
if (elProviderCustomUrlSettings && document.querySelector<HTMLInputElement>('#oauth2_use_custom_url').checked) {
|
||||||
for (const custom of ['token_url', 'auth_url', 'profile_url', 'email_url', 'tenant']) {
|
for (const custom of ['token_url', 'auth_url', 'profile_url', 'email_url', 'tenant']) {
|
||||||
if (applyDefaultValues) {
|
if (applyDefaultValues) {
|
||||||
document.querySelector(`#oauth2_${custom}`).value = document.querySelector(`#${provider}_${custom}`).value;
|
document.querySelector<HTMLInputElement>(`#oauth2_${custom}`).value = document.querySelector<HTMLInputElement>(`#${provider}_${custom}`).value;
|
||||||
}
|
}
|
||||||
const customInput = document.querySelector(`#${provider}_${custom}`);
|
const customInput = document.querySelector(`#${provider}_${custom}`);
|
||||||
if (customInput && customInput.getAttribute('data-available') === 'true') {
|
if (customInput && customInput.getAttribute('data-available') === 'true') {
|
||||||
|
@ -115,25 +115,26 @@ export function initAdminCommon() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function onEnableLdapGroupsChange() {
|
function onEnableLdapGroupsChange() {
|
||||||
toggleElem(document.querySelector('#ldap-group-options'), $('.js-ldap-group-toggle')[0].checked);
|
const checked = document.querySelector<HTMLInputElement>('.js-ldap-group-toggle')?.checked;
|
||||||
|
toggleElem(document.querySelector('#ldap-group-options'), checked);
|
||||||
}
|
}
|
||||||
|
|
||||||
// New authentication
|
// New authentication
|
||||||
if (document.querySelector('.admin.new.authentication')) {
|
if (document.querySelector<HTMLDivElement>('.admin.new.authentication')) {
|
||||||
document.querySelector('#auth_type')?.addEventListener('change', function () {
|
document.querySelector<HTMLInputElement>('#auth_type')?.addEventListener('change', function () {
|
||||||
hideElem('.ldap, .dldap, .smtp, .pam, .oauth2, .has-tls, .search-page-size, .sspi');
|
hideElem('.ldap, .dldap, .smtp, .pam, .oauth2, .has-tls, .search-page-size, .sspi');
|
||||||
|
|
||||||
for (const input of document.querySelectorAll('.ldap input[required], .binddnrequired input[required], .dldap input[required], .smtp input[required], .pam input[required], .oauth2 input[required], .has-tls input[required], .sspi input[required]')) {
|
for (const input of document.querySelectorAll<HTMLInputElement>('.ldap input[required], .binddnrequired input[required], .dldap input[required], .smtp input[required], .pam input[required], .oauth2 input[required], .has-tls input[required], .sspi input[required]')) {
|
||||||
input.removeAttribute('required');
|
input.removeAttribute('required');
|
||||||
}
|
}
|
||||||
|
|
||||||
document.querySelector('.binddnrequired')?.classList.remove('required');
|
document.querySelector<HTMLDivElement>('.binddnrequired')?.classList.remove('required');
|
||||||
|
|
||||||
const authType = this.value;
|
const authType = this.value;
|
||||||
switch (authType) {
|
switch (authType) {
|
||||||
case '2': // LDAP
|
case '2': // LDAP
|
||||||
showElem('.ldap');
|
showElem('.ldap');
|
||||||
for (const input of document.querySelectorAll('.binddnrequired input, .ldap div.required:not(.dldap) input')) {
|
for (const input of document.querySelectorAll<HTMLInputElement>('.binddnrequired input, .ldap div.required:not(.dldap) input')) {
|
||||||
input.setAttribute('required', 'required');
|
input.setAttribute('required', 'required');
|
||||||
}
|
}
|
||||||
document.querySelector('.binddnrequired')?.classList.add('required');
|
document.querySelector('.binddnrequired')?.classList.add('required');
|
||||||
|
@ -141,32 +142,32 @@ export function initAdminCommon() {
|
||||||
case '3': // SMTP
|
case '3': // SMTP
|
||||||
showElem('.smtp');
|
showElem('.smtp');
|
||||||
showElem('.has-tls');
|
showElem('.has-tls');
|
||||||
for (const input of document.querySelectorAll('.smtp div.required input, .has-tls')) {
|
for (const input of document.querySelectorAll<HTMLInputElement>('.smtp div.required input, .has-tls')) {
|
||||||
input.setAttribute('required', 'required');
|
input.setAttribute('required', 'required');
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case '4': // PAM
|
case '4': // PAM
|
||||||
showElem('.pam');
|
showElem('.pam');
|
||||||
for (const input of document.querySelectorAll('.pam input')) {
|
for (const input of document.querySelectorAll<HTMLInputElement>('.pam input')) {
|
||||||
input.setAttribute('required', 'required');
|
input.setAttribute('required', 'required');
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case '5': // LDAP
|
case '5': // LDAP
|
||||||
showElem('.dldap');
|
showElem('.dldap');
|
||||||
for (const input of document.querySelectorAll('.dldap div.required:not(.ldap) input')) {
|
for (const input of document.querySelectorAll<HTMLInputElement>('.dldap div.required:not(.ldap) input')) {
|
||||||
input.setAttribute('required', 'required');
|
input.setAttribute('required', 'required');
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case '6': // OAuth2
|
case '6': // OAuth2
|
||||||
showElem('.oauth2');
|
showElem('.oauth2');
|
||||||
for (const input of document.querySelectorAll('.oauth2 div.required:not(.oauth2_use_custom_url,.oauth2_use_custom_url_field,.open_id_connect_auto_discovery_url) input')) {
|
for (const input of document.querySelectorAll<HTMLInputElement>('.oauth2 div.required:not(.oauth2_use_custom_url,.oauth2_use_custom_url_field,.open_id_connect_auto_discovery_url) input')) {
|
||||||
input.setAttribute('required', 'required');
|
input.setAttribute('required', 'required');
|
||||||
}
|
}
|
||||||
onOAuth2Change(true);
|
onOAuth2Change(true);
|
||||||
break;
|
break;
|
||||||
case '7': // SSPI
|
case '7': // SSPI
|
||||||
showElem('.sspi');
|
showElem('.sspi');
|
||||||
for (const input of document.querySelectorAll('.sspi div.required input')) {
|
for (const input of document.querySelectorAll<HTMLInputElement>('.sspi div.required input')) {
|
||||||
input.setAttribute('required', 'required');
|
input.setAttribute('required', 'required');
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -180,39 +181,39 @@ export function initAdminCommon() {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
$('#auth_type').trigger('change');
|
$('#auth_type').trigger('change');
|
||||||
document.querySelector('#security_protocol')?.addEventListener('change', onSecurityProtocolChange);
|
document.querySelector<HTMLInputElement>('#security_protocol')?.addEventListener('change', onSecurityProtocolChange);
|
||||||
document.querySelector('#use_paged_search')?.addEventListener('change', onUsePagedSearchChange);
|
document.querySelector<HTMLInputElement>('#use_paged_search')?.addEventListener('change', onUsePagedSearchChange);
|
||||||
document.querySelector('#oauth2_provider')?.addEventListener('change', () => onOAuth2Change(true));
|
document.querySelector<HTMLInputElement>('#oauth2_provider')?.addEventListener('change', () => onOAuth2Change(true));
|
||||||
document.querySelector('#oauth2_use_custom_url')?.addEventListener('change', () => onOAuth2UseCustomURLChange(true));
|
document.querySelector<HTMLInputElement>('#oauth2_use_custom_url')?.addEventListener('change', () => onOAuth2UseCustomURLChange(true));
|
||||||
$('.js-ldap-group-toggle').on('change', onEnableLdapGroupsChange);
|
$('.js-ldap-group-toggle').on('change', onEnableLdapGroupsChange);
|
||||||
}
|
}
|
||||||
// Edit authentication
|
// Edit authentication
|
||||||
if (document.querySelector('.admin.edit.authentication')) {
|
if (document.querySelector<HTMLDivElement>('.admin.edit.authentication')) {
|
||||||
const authType = document.querySelector('#auth_type')?.value;
|
const authType = document.querySelector<HTMLInputElement>('#auth_type')?.value;
|
||||||
if (authType === '2' || authType === '5') {
|
if (authType === '2' || authType === '5') {
|
||||||
document.querySelector('#security_protocol')?.addEventListener('change', onSecurityProtocolChange);
|
document.querySelector<HTMLInputElement>('#security_protocol')?.addEventListener('change', onSecurityProtocolChange);
|
||||||
$('.js-ldap-group-toggle').on('change', onEnableLdapGroupsChange);
|
$('.js-ldap-group-toggle').on('change', onEnableLdapGroupsChange);
|
||||||
onEnableLdapGroupsChange();
|
onEnableLdapGroupsChange();
|
||||||
if (authType === '2') {
|
if (authType === '2') {
|
||||||
document.querySelector('#use_paged_search')?.addEventListener('change', onUsePagedSearchChange);
|
document.querySelector<HTMLInputElement>('#use_paged_search')?.addEventListener('change', onUsePagedSearchChange);
|
||||||
}
|
}
|
||||||
} else if (authType === '6') {
|
} else if (authType === '6') {
|
||||||
document.querySelector('#oauth2_provider')?.addEventListener('change', () => onOAuth2Change(true));
|
document.querySelector<HTMLInputElement>('#oauth2_provider')?.addEventListener('change', () => onOAuth2Change(true));
|
||||||
document.querySelector('#oauth2_use_custom_url')?.addEventListener('change', () => onOAuth2UseCustomURLChange(false));
|
document.querySelector<HTMLInputElement>('#oauth2_use_custom_url')?.addEventListener('change', () => onOAuth2UseCustomURLChange(false));
|
||||||
onOAuth2Change(false);
|
onOAuth2Change(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (document.querySelector('.admin.authentication')) {
|
if (document.querySelector<HTMLDivElement>('.admin.authentication')) {
|
||||||
$('#auth_name').on('input', function () {
|
$('#auth_name').on('input', function () {
|
||||||
// appSubUrl is either empty or is a path that starts with `/` and doesn't have a trailing slash.
|
// appSubUrl is either empty or is a path that starts with `/` and doesn't have a trailing slash.
|
||||||
document.querySelector('#oauth2-callback-url').textContent = `${window.location.origin}${appSubUrl}/user/oauth2/${encodeURIComponent(this.value)}/callback`;
|
document.querySelector('#oauth2-callback-url').textContent = `${window.location.origin}${appSubUrl}/user/oauth2/${encodeURIComponent((this as HTMLInputElement).value)}/callback`;
|
||||||
}).trigger('input');
|
}).trigger('input');
|
||||||
}
|
}
|
||||||
|
|
||||||
// Notice
|
// Notice
|
||||||
if (document.querySelector('.admin.notice')) {
|
if (document.querySelector<HTMLDivElement>('.admin.notice')) {
|
||||||
const detailModal = document.querySelector('#detail-modal');
|
const detailModal = document.querySelector<HTMLDivElement>('#detail-modal');
|
||||||
|
|
||||||
// Attach view detail modals
|
// Attach view detail modals
|
||||||
$('.view-detail').on('click', function () {
|
$('.view-detail').on('click', function () {
|
||||||
|
@ -223,7 +224,7 @@ export function initAdminCommon() {
|
||||||
});
|
});
|
||||||
|
|
||||||
// Select actions
|
// Select actions
|
||||||
const checkboxes = document.querySelectorAll('.select.table .ui.checkbox input');
|
const checkboxes = document.querySelectorAll<HTMLInputElement>('.select.table .ui.checkbox input');
|
||||||
|
|
||||||
$('.select.action').on('click', function () {
|
$('.select.action').on('click', function () {
|
||||||
switch ($(this).data('action')) {
|
switch ($(this).data('action')) {
|
||||||
|
@ -244,7 +245,7 @@ export function initAdminCommon() {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
document.querySelector('#delete-selection')?.addEventListener('click', async function (e) {
|
document.querySelector<HTMLButtonElement>('#delete-selection')?.addEventListener('click', async function (e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
this.classList.add('is-loading', 'disabled');
|
this.classList.add('is-loading', 'disabled');
|
||||||
const data = new FormData();
|
const data = new FormData();
|
||||||
|
|
|
@ -3,17 +3,17 @@ import {POST} from '../../modules/fetch.ts';
|
||||||
|
|
||||||
const {appSubUrl} = window.config;
|
const {appSubUrl} = window.config;
|
||||||
|
|
||||||
export function initAdminConfigs() {
|
export function initAdminConfigs(): void {
|
||||||
const elAdminConfig = document.querySelector('.page-content.admin.config');
|
const elAdminConfig = document.querySelector<HTMLDivElement>('.page-content.admin.config');
|
||||||
if (!elAdminConfig) return;
|
if (!elAdminConfig) return;
|
||||||
|
|
||||||
for (const el of elAdminConfig.querySelectorAll('input[type="checkbox"][data-config-dyn-key]')) {
|
for (const el of elAdminConfig.querySelectorAll<HTMLInputElement>('input[type="checkbox"][data-config-dyn-key]')) {
|
||||||
el.addEventListener('change', async () => {
|
el.addEventListener('change', async () => {
|
||||||
try {
|
try {
|
||||||
const resp = await POST(`${appSubUrl}/-/admin/config`, {
|
const resp = await POST(`${appSubUrl}/-/admin/config`, {
|
||||||
data: new URLSearchParams({key: el.getAttribute('data-config-dyn-key'), value: el.checked}),
|
data: new URLSearchParams({key: el.getAttribute('data-config-dyn-key'), value: String(el.checked)}),
|
||||||
});
|
});
|
||||||
const json = await resp.json();
|
const json: Record<string, any> = await resp.json();
|
||||||
if (json.errorMessage) throw new Error(json.errorMessage);
|
if (json.errorMessage) throw new Error(json.errorMessage);
|
||||||
} catch (ex) {
|
} catch (ex) {
|
||||||
showTemporaryTooltip(el, ex.toString());
|
showTemporaryTooltip(el, ex.toString());
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import $ from 'jquery';
|
import $ from 'jquery';
|
||||||
|
|
||||||
export function initAdminEmails() {
|
export function initAdminEmails(): void {
|
||||||
function linkEmailAction(e) {
|
$('.link-email-action').on('click', (e) => {
|
||||||
const $this = $(this);
|
const $this = $(this);
|
||||||
$('#form-uid').val($this.data('uid'));
|
$('#form-uid').val($this.data('uid'));
|
||||||
$('#form-email').val($this.data('email'));
|
$('#form-email').val($this.data('email'));
|
||||||
|
@ -9,6 +9,5 @@ export function initAdminEmails() {
|
||||||
$('#form-activate').val($this.data('activate'));
|
$('#form-activate').val($this.data('activate'));
|
||||||
$('#change-email-modal').modal('show');
|
$('#change-email-modal').modal('show');
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
}
|
});
|
||||||
$('.link-email-action').on('click', linkEmailAction);
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,16 +7,16 @@ export async function initAdminSelfCheck() {
|
||||||
const elCheckByFrontend = document.querySelector('#self-check-by-frontend');
|
const elCheckByFrontend = document.querySelector('#self-check-by-frontend');
|
||||||
if (!elCheckByFrontend) return;
|
if (!elCheckByFrontend) return;
|
||||||
|
|
||||||
const elContent = document.querySelector('.page-content.admin .admin-setting-content');
|
const elContent = document.querySelector<HTMLDivElement>('.page-content.admin .admin-setting-content');
|
||||||
|
|
||||||
// send frontend self-check request
|
// send frontend self-check request
|
||||||
const resp = await POST(`${appSubUrl}/-/admin/self_check`, {
|
const resp = await POST(`${appSubUrl}/-/admin/self_check`, {
|
||||||
data: new URLSearchParams({
|
data: new URLSearchParams({
|
||||||
location_origin: window.location.origin,
|
location_origin: window.location.origin,
|
||||||
now: Date.now(), // TODO: check time difference between server and client
|
now: String(Date.now()), // TODO: check time difference between server and client
|
||||||
}),
|
}),
|
||||||
});
|
});
|
||||||
const json = await resp.json();
|
const json: Record<string, any> = await resp.json();
|
||||||
toggleElem(elCheckByFrontend, Boolean(json.problems?.length));
|
toggleElem(elCheckByFrontend, Boolean(json.problems?.length));
|
||||||
for (const problem of json.problems ?? []) {
|
for (const problem of json.problems ?? []) {
|
||||||
const elProblem = document.createElement('div');
|
const elProblem = document.createElement('div');
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
export function initAdminUserListSearchForm() {
|
export function initAdminUserListSearchForm(): void {
|
||||||
const searchForm = window.config.pageData.adminUserListSearchForm;
|
const searchForm = window.config.pageData.adminUserListSearchForm;
|
||||||
if (!searchForm) return;
|
if (!searchForm) return;
|
||||||
|
|
||||||
const form = document.querySelector('#user-list-search-form');
|
const form = document.querySelector<HTMLFormElement>('#user-list-search-form');
|
||||||
if (!form) return;
|
if (!form) return;
|
||||||
|
|
||||||
for (const button of form.querySelectorAll(`button[name=sort][value="${searchForm.SortType}"]`)) {
|
for (const button of form.querySelectorAll(`button[name=sort][value="${searchForm.SortType}"]`)) {
|
||||||
|
@ -12,23 +12,23 @@ export function initAdminUserListSearchForm() {
|
||||||
if (searchForm.StatusFilterMap) {
|
if (searchForm.StatusFilterMap) {
|
||||||
for (const [k, v] of Object.entries(searchForm.StatusFilterMap)) {
|
for (const [k, v] of Object.entries(searchForm.StatusFilterMap)) {
|
||||||
if (!v) continue;
|
if (!v) continue;
|
||||||
for (const input of form.querySelectorAll(`input[name="status_filter[${k}]"][value="${v}"]`)) {
|
for (const input of form.querySelectorAll<HTMLInputElement>(`input[name="status_filter[${k}]"][value="${v}"]`)) {
|
||||||
input.checked = true;
|
input.checked = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const radio of form.querySelectorAll('input[type=radio]')) {
|
for (const radio of form.querySelectorAll<HTMLInputElement>('input[type=radio]')) {
|
||||||
radio.addEventListener('click', () => {
|
radio.addEventListener('click', () => {
|
||||||
form.submit();
|
form.submit();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const resetButtons = form.querySelectorAll('.j-reset-status-filter');
|
const resetButtons = form.querySelectorAll<HTMLAnchorElement>('.j-reset-status-filter');
|
||||||
for (const button of resetButtons) {
|
for (const button of resetButtons) {
|
||||||
button.addEventListener('click', (e) => {
|
button.addEventListener('click', (e) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
for (const input of form.querySelectorAll('input[type=radio]')) {
|
for (const input of form.querySelectorAll<HTMLInputElement>('input[type=radio]')) {
|
||||||
if (input.name.startsWith('status_filter[')) {
|
if (input.name.startsWith('status_filter[')) {
|
||||||
input.checked = false;
|
input.checked = false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,13 +32,13 @@ export function initGlobalDropdown() {
|
||||||
const $uiDropdowns = fomanticQuery('.ui.dropdown');
|
const $uiDropdowns = fomanticQuery('.ui.dropdown');
|
||||||
|
|
||||||
// do not init "custom" dropdowns, "custom" dropdowns are managed by their own code.
|
// do not init "custom" dropdowns, "custom" dropdowns are managed by their own code.
|
||||||
$uiDropdowns.filter(':not(.custom)').dropdown();
|
$uiDropdowns.filter(':not(.custom)').dropdown({hideDividers: 'empty'});
|
||||||
|
|
||||||
// The "jump" means this dropdown is mainly used for "menu" purpose,
|
// The "jump" means this dropdown is mainly used for "menu" purpose,
|
||||||
// clicking an item will jump to somewhere else or trigger an action/function.
|
// clicking an item will jump to somewhere else or trigger an action/function.
|
||||||
// When a dropdown is used for non-refresh actions with tippy,
|
// When a dropdown is used for non-refresh actions with tippy,
|
||||||
// it must have this "jump" class to hide the tippy when dropdown is closed.
|
// it must have this "jump" class to hide the tippy when dropdown is closed.
|
||||||
$uiDropdowns.filter('.jump').dropdown({
|
$uiDropdowns.filter('.jump').dropdown('setting', {
|
||||||
action: 'hide',
|
action: 'hide',
|
||||||
onShow() {
|
onShow() {
|
||||||
// hide associated tooltip while dropdown is open
|
// hide associated tooltip while dropdown is open
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
import {fomanticQuery} from '../modules/fomantic/base.ts';
|
import {fomanticQuery} from '../modules/fomantic/base.ts';
|
||||||
import {POST} from '../modules/fetch.ts';
|
import {POST} from '../modules/fetch.ts';
|
||||||
import {queryElemChildren, toggleElem} from '../utils/dom.ts';
|
import {queryElemChildren, queryElems, toggleElem} from '../utils/dom.ts';
|
||||||
|
|
||||||
// if there are draft comments, confirm before reloading, to avoid losing comments
|
// if there are draft comments, confirm before reloading, to avoid losing comments
|
||||||
export function issueSidebarReloadConfirmDraftComment() {
|
function issueSidebarReloadConfirmDraftComment() {
|
||||||
const commentTextareas = [
|
const commentTextareas = [
|
||||||
document.querySelector<HTMLTextAreaElement>('.edit-content-zone:not(.tw-hidden) textarea'),
|
document.querySelector<HTMLTextAreaElement>('.edit-content-zone:not(.tw-hidden) textarea'),
|
||||||
document.querySelector<HTMLTextAreaElement>('#comment-form textarea'),
|
document.querySelector<HTMLTextAreaElement>('#comment-form textarea'),
|
||||||
|
@ -22,68 +22,138 @@ export function issueSidebarReloadConfirmDraftComment() {
|
||||||
window.location.reload();
|
window.location.reload();
|
||||||
}
|
}
|
||||||
|
|
||||||
function collectCheckedValues(elDropdown: HTMLElement) {
|
class IssueSidebarComboList {
|
||||||
return Array.from(elDropdown.querySelectorAll('.menu > .item.checked'), (el) => el.getAttribute('data-value'));
|
updateUrl: string;
|
||||||
}
|
updateAlgo: string;
|
||||||
|
selectionMode: string;
|
||||||
|
elDropdown: HTMLElement;
|
||||||
|
elList: HTMLElement;
|
||||||
|
elComboValue: HTMLInputElement;
|
||||||
|
initialValues: string[];
|
||||||
|
|
||||||
export function initIssueSidebarComboList(container: HTMLElement) {
|
constructor(private container: HTMLElement) {
|
||||||
if (!container) return;
|
this.updateUrl = this.container.getAttribute('data-update-url');
|
||||||
|
this.updateAlgo = container.getAttribute('data-update-algo');
|
||||||
|
this.selectionMode = container.getAttribute('data-selection-mode');
|
||||||
|
if (!['single', 'multiple'].includes(this.selectionMode)) throw new Error(`Invalid data-update-on: ${this.selectionMode}`);
|
||||||
|
if (!['diff', 'all'].includes(this.updateAlgo)) throw new Error(`Invalid data-update-algo: ${this.updateAlgo}`);
|
||||||
|
this.elDropdown = container.querySelector<HTMLElement>(':scope > .ui.dropdown');
|
||||||
|
this.elList = container.querySelector<HTMLElement>(':scope > .ui.list');
|
||||||
|
this.elComboValue = container.querySelector<HTMLInputElement>(':scope > .combo-value');
|
||||||
|
}
|
||||||
|
|
||||||
const updateUrl = container.getAttribute('data-update-url');
|
collectCheckedValues() {
|
||||||
const elDropdown = container.querySelector<HTMLElement>(':scope > .ui.dropdown');
|
return Array.from(this.elDropdown.querySelectorAll('.menu > .item.checked'), (el) => el.getAttribute('data-value'));
|
||||||
const elList = container.querySelector<HTMLElement>(':scope > .ui.list');
|
}
|
||||||
const elComboValue = container.querySelector<HTMLInputElement>(':scope > .combo-value');
|
|
||||||
const initialValues = collectCheckedValues(elDropdown);
|
|
||||||
|
|
||||||
elDropdown.addEventListener('click', (e) => {
|
updateUiList(changedValues) {
|
||||||
|
const elEmptyTip = this.elList.querySelector('.item.empty-list');
|
||||||
|
queryElemChildren(this.elList, '.item:not(.empty-list)', (el) => el.remove());
|
||||||
|
for (const value of changedValues) {
|
||||||
|
const el = this.elDropdown.querySelector<HTMLElement>(`.menu > .item[data-value="${CSS.escape(value)}"]`);
|
||||||
|
if (!el) continue;
|
||||||
|
const listItem = el.cloneNode(true) as HTMLElement;
|
||||||
|
queryElems(listItem, '.item-check-mark, .item-secondary-info', (el) => el.remove());
|
||||||
|
this.elList.append(listItem);
|
||||||
|
}
|
||||||
|
const hasItems = Boolean(this.elList.querySelector('.item:not(.empty-list)'));
|
||||||
|
toggleElem(elEmptyTip, !hasItems);
|
||||||
|
}
|
||||||
|
|
||||||
|
async updateToBackend(changedValues) {
|
||||||
|
if (this.updateAlgo === 'diff') {
|
||||||
|
for (const value of this.initialValues) {
|
||||||
|
if (!changedValues.includes(value)) {
|
||||||
|
await POST(this.updateUrl, {data: new URLSearchParams({action: 'detach', id: value})});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (const value of changedValues) {
|
||||||
|
if (!this.initialValues.includes(value)) {
|
||||||
|
await POST(this.updateUrl, {data: new URLSearchParams({action: 'attach', id: value})});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
await POST(this.updateUrl, {data: new URLSearchParams({id: changedValues.join(',')})});
|
||||||
|
}
|
||||||
|
issueSidebarReloadConfirmDraftComment();
|
||||||
|
}
|
||||||
|
|
||||||
|
async doUpdate() {
|
||||||
|
const changedValues = this.collectCheckedValues();
|
||||||
|
if (this.initialValues.join(',') === changedValues.join(',')) return;
|
||||||
|
this.updateUiList(changedValues);
|
||||||
|
if (this.updateUrl) await this.updateToBackend(changedValues);
|
||||||
|
this.initialValues = changedValues;
|
||||||
|
}
|
||||||
|
|
||||||
|
async onChange() {
|
||||||
|
if (this.selectionMode === 'single') {
|
||||||
|
await this.doUpdate();
|
||||||
|
fomanticQuery(this.elDropdown).dropdown('hide');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async onItemClick(e) {
|
||||||
const elItem = (e.target as HTMLElement).closest('.item');
|
const elItem = (e.target as HTMLElement).closest('.item');
|
||||||
if (!elItem) return;
|
if (!elItem) return;
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
if (elItem.getAttribute('data-can-change') !== 'true') return;
|
if (elItem.hasAttribute('data-can-change') && elItem.getAttribute('data-can-change') !== 'true') return;
|
||||||
elItem.classList.toggle('checked');
|
|
||||||
elComboValue.value = collectCheckedValues(elDropdown).join(',');
|
|
||||||
});
|
|
||||||
|
|
||||||
const updateToBackend = async (changedValues) => {
|
if (elItem.matches('.clear-selection')) {
|
||||||
let changed = false;
|
queryElems(this.elDropdown, '.menu > .item', (el) => el.classList.remove('checked'));
|
||||||
for (const value of initialValues) {
|
this.elComboValue.value = '';
|
||||||
if (!changedValues.includes(value)) {
|
this.onChange();
|
||||||
await POST(updateUrl, {data: new URLSearchParams({action: 'detach', id: value})});
|
return;
|
||||||
changed = true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
for (const value of changedValues) {
|
|
||||||
if (!initialValues.includes(value)) {
|
|
||||||
await POST(updateUrl, {data: new URLSearchParams({action: 'attach', id: value})});
|
|
||||||
changed = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (changed) issueSidebarReloadConfirmDraftComment();
|
|
||||||
};
|
|
||||||
|
|
||||||
const syncList = (changedValues) => {
|
const scope = elItem.getAttribute('data-scope');
|
||||||
const elEmptyTip = elList.querySelector('.item.empty-list');
|
if (scope) {
|
||||||
queryElemChildren(elList, '.item:not(.empty-list)', (el) => el.remove());
|
// scoped items could only be checked one at a time
|
||||||
for (const value of changedValues) {
|
const elSelected = this.elDropdown.querySelector<HTMLElement>(`.menu > .item.checked[data-scope="${CSS.escape(scope)}"]`);
|
||||||
const el = elDropdown.querySelector<HTMLElement>(`.menu > .item[data-value="${value}"]`);
|
if (elSelected === elItem) {
|
||||||
const listItem = el.cloneNode(true) as HTMLElement;
|
elItem.classList.toggle('checked');
|
||||||
listItem.querySelector('svg.octicon-check')?.remove();
|
|
||||||
elList.append(listItem);
|
|
||||||
}
|
|
||||||
const hasItems = Boolean(elList.querySelector('.item:not(.empty-list)'));
|
|
||||||
toggleElem(elEmptyTip, !hasItems);
|
|
||||||
};
|
|
||||||
|
|
||||||
fomanticQuery(elDropdown).dropdown({
|
|
||||||
action: 'nothing', // do not hide the menu if user presses Enter
|
|
||||||
fullTextSearch: 'exact',
|
|
||||||
async onHide() {
|
|
||||||
const changedValues = collectCheckedValues(elDropdown);
|
|
||||||
if (updateUrl) {
|
|
||||||
await updateToBackend(changedValues); // send requests to backend and reload the page
|
|
||||||
} else {
|
} else {
|
||||||
syncList(changedValues); // only update the list in the sidebar
|
queryElems(this.elDropdown, `.menu > .item[data-scope="${CSS.escape(scope)}"]`, (el) => el.classList.remove('checked'));
|
||||||
|
elItem.classList.toggle('checked', true);
|
||||||
}
|
}
|
||||||
},
|
} else {
|
||||||
});
|
if (this.selectionMode === 'multiple') {
|
||||||
|
elItem.classList.toggle('checked');
|
||||||
|
} else {
|
||||||
|
queryElems(this.elDropdown, `.menu > .item.checked`, (el) => el.classList.remove('checked'));
|
||||||
|
elItem.classList.toggle('checked', true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.elComboValue.value = this.collectCheckedValues().join(',');
|
||||||
|
this.onChange();
|
||||||
|
}
|
||||||
|
|
||||||
|
async onHide() {
|
||||||
|
if (this.selectionMode === 'multiple') this.doUpdate();
|
||||||
|
}
|
||||||
|
|
||||||
|
init() {
|
||||||
|
// init the checked items from initial value
|
||||||
|
if (this.elComboValue.value && this.elComboValue.value !== '0' && !queryElems(this.elDropdown, `.menu > .item.checked`).length) {
|
||||||
|
const values = this.elComboValue.value.split(',');
|
||||||
|
for (const value of values) {
|
||||||
|
const elItem = this.elDropdown.querySelector<HTMLElement>(`.menu > .item[data-value="${CSS.escape(value)}"]`);
|
||||||
|
elItem?.classList.add('checked');
|
||||||
|
}
|
||||||
|
this.updateUiList(values);
|
||||||
|
}
|
||||||
|
this.initialValues = this.collectCheckedValues();
|
||||||
|
|
||||||
|
this.elDropdown.addEventListener('click', (e) => this.onItemClick(e));
|
||||||
|
|
||||||
|
fomanticQuery(this.elDropdown).dropdown('setting', {
|
||||||
|
action: 'nothing', // do not hide the menu if user presses Enter
|
||||||
|
fullTextSearch: 'exact',
|
||||||
|
onHide: () => this.onHide(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function initIssueSidebarComboList(container: HTMLElement) {
|
||||||
|
new IssueSidebarComboList(container).init();
|
||||||
}
|
}
|
||||||
|
|
31
web_src/js/features/repo-issue-sidebar.md
Normal file
31
web_src/js/features/repo-issue-sidebar.md
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
A sidebar combo (dropdown+list) is like this:
|
||||||
|
|
||||||
|
```html
|
||||||
|
<div class="issue-sidebar-combo" data-selection-mode="..." data-update-url="...">
|
||||||
|
<input class="combo-value" name="..." type="hidden" value="...">
|
||||||
|
<div class="ui dropdown">
|
||||||
|
<div class="menu">
|
||||||
|
<div class="item clear-selection">clear</div>
|
||||||
|
<div class="item" data-value="..." data-scope="...">
|
||||||
|
<span class="item-check-mark">...</span>
|
||||||
|
...
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="ui list">
|
||||||
|
<span class="item empty-list">no item</span>
|
||||||
|
<span class="item">...</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
```
|
||||||
|
|
||||||
|
When the selected items change, the `combo-value` input will be updated.
|
||||||
|
If there is `data-update-url`, it also calls backend to attach/detach the changed items.
|
||||||
|
|
||||||
|
Also, the changed items will be syncronized to the `ui list` items.
|
||||||
|
|
||||||
|
The items with the same data-scope only allow one selected at a time.
|
||||||
|
|
||||||
|
The dropdown selection could work in 2 modes:
|
||||||
|
* single: only one item could be selected, it updates immediately when the item is selected.
|
||||||
|
* multiple: multiple items could be selected, it defers the update until the dropdown is hidden.
|
|
@ -1,10 +1,7 @@
|
||||||
import $ from 'jquery';
|
import $ from 'jquery';
|
||||||
import {POST} from '../modules/fetch.ts';
|
import {POST} from '../modules/fetch.ts';
|
||||||
import {updateIssuesMeta} from './repo-common.ts';
|
import {queryElems, toggleElem} from '../utils/dom.ts';
|
||||||
import {svg} from '../svg.ts';
|
import {initIssueSidebarComboList} from './repo-issue-sidebar-combolist.ts';
|
||||||
import {htmlEscape} from 'escape-goat';
|
|
||||||
import {toggleElem} from '../utils/dom.ts';
|
|
||||||
import {initIssueSidebarComboList, issueSidebarReloadConfirmDraftComment} from './repo-issue-sidebar-combolist.ts';
|
|
||||||
|
|
||||||
function initBranchSelector() {
|
function initBranchSelector() {
|
||||||
const elSelectBranch = document.querySelector('.ui.dropdown.select-branch');
|
const elSelectBranch = document.querySelector('.ui.dropdown.select-branch');
|
||||||
|
@ -28,218 +25,12 @@ function initBranchSelector() {
|
||||||
} else {
|
} else {
|
||||||
// for new issue, only update UI&form, do not send request/reload
|
// for new issue, only update UI&form, do not send request/reload
|
||||||
const selectedHiddenSelector = this.getAttribute('data-id-selector');
|
const selectedHiddenSelector = this.getAttribute('data-id-selector');
|
||||||
document.querySelector(selectedHiddenSelector).value = selectedValue;
|
document.querySelector<HTMLInputElement>(selectedHiddenSelector).value = selectedValue;
|
||||||
elSelectBranch.querySelector('.text-branch-name').textContent = selectedText;
|
elSelectBranch.querySelector('.text-branch-name').textContent = selectedText;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// List submits
|
|
||||||
function initListSubmits(selector, outerSelector) {
|
|
||||||
const $list = $(`.ui.${outerSelector}.list`);
|
|
||||||
const $noSelect = $list.find('.no-select');
|
|
||||||
const $listMenu = $(`.${selector} .menu`);
|
|
||||||
let hasUpdateAction = $listMenu.data('action') === 'update';
|
|
||||||
const items = {};
|
|
||||||
|
|
||||||
$(`.${selector}`).dropdown({
|
|
||||||
'action': 'nothing', // do not hide the menu if user presses Enter
|
|
||||||
fullTextSearch: 'exact',
|
|
||||||
async onHide() {
|
|
||||||
hasUpdateAction = $listMenu.data('action') === 'update'; // Update the var
|
|
||||||
if (hasUpdateAction) {
|
|
||||||
// TODO: Add batch functionality and make this 1 network request.
|
|
||||||
const itemEntries = Object.entries(items);
|
|
||||||
for (const [elementId, item] of itemEntries) {
|
|
||||||
await updateIssuesMeta(
|
|
||||||
item['update-url'],
|
|
||||||
item.action,
|
|
||||||
item['issue-id'],
|
|
||||||
elementId,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
if (itemEntries.length) {
|
|
||||||
issueSidebarReloadConfirmDraftComment();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
$listMenu.find('.item:not(.no-select)').on('click', function (e) {
|
|
||||||
e.preventDefault();
|
|
||||||
if (this.classList.contains('ban-change')) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
hasUpdateAction = $listMenu.data('action') === 'update'; // Update the var
|
|
||||||
|
|
||||||
const clickedItem = this; // eslint-disable-line unicorn/no-this-assignment
|
|
||||||
const scope = this.getAttribute('data-scope');
|
|
||||||
|
|
||||||
$(this).parent().find('.item').each(function () {
|
|
||||||
if (scope) {
|
|
||||||
// Enable only clicked item for scoped labels
|
|
||||||
if (this.getAttribute('data-scope') !== scope) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if (this !== clickedItem && !this.classList.contains('checked')) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
} else if (this !== clickedItem) {
|
|
||||||
// Toggle for other labels
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.classList.contains('checked')) {
|
|
||||||
$(this).removeClass('checked');
|
|
||||||
$(this).find('.octicon-check').addClass('tw-invisible');
|
|
||||||
if (hasUpdateAction) {
|
|
||||||
if (!($(this).data('id') in items)) {
|
|
||||||
items[$(this).data('id')] = {
|
|
||||||
'update-url': $listMenu.data('update-url'),
|
|
||||||
action: 'detach',
|
|
||||||
'issue-id': $listMenu.data('issue-id'),
|
|
||||||
};
|
|
||||||
} else {
|
|
||||||
delete items[$(this).data('id')];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$(this).addClass('checked');
|
|
||||||
$(this).find('.octicon-check').removeClass('tw-invisible');
|
|
||||||
if (hasUpdateAction) {
|
|
||||||
if (!($(this).data('id') in items)) {
|
|
||||||
items[$(this).data('id')] = {
|
|
||||||
'update-url': $listMenu.data('update-url'),
|
|
||||||
action: 'attach',
|
|
||||||
'issue-id': $listMenu.data('issue-id'),
|
|
||||||
};
|
|
||||||
} else {
|
|
||||||
delete items[$(this).data('id')];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// TODO: Which thing should be done for choosing review requests
|
|
||||||
// to make chosen items be shown on time here?
|
|
||||||
if (selector === 'select-assignees-modify') {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
const listIds = [];
|
|
||||||
$(this).parent().find('.item').each(function () {
|
|
||||||
if (this.classList.contains('checked')) {
|
|
||||||
listIds.push($(this).data('id'));
|
|
||||||
$($(this).data('id-selector')).removeClass('tw-hidden');
|
|
||||||
} else {
|
|
||||||
$($(this).data('id-selector')).addClass('tw-hidden');
|
|
||||||
}
|
|
||||||
});
|
|
||||||
if (!listIds.length) {
|
|
||||||
$noSelect.removeClass('tw-hidden');
|
|
||||||
} else {
|
|
||||||
$noSelect.addClass('tw-hidden');
|
|
||||||
}
|
|
||||||
$($(this).parent().data('id')).val(listIds.join(','));
|
|
||||||
return false;
|
|
||||||
});
|
|
||||||
$listMenu.find('.no-select.item').on('click', function (e) {
|
|
||||||
e.preventDefault();
|
|
||||||
if (hasUpdateAction) {
|
|
||||||
(async () => {
|
|
||||||
await updateIssuesMeta(
|
|
||||||
$listMenu.data('update-url'),
|
|
||||||
'clear',
|
|
||||||
$listMenu.data('issue-id'),
|
|
||||||
'',
|
|
||||||
);
|
|
||||||
issueSidebarReloadConfirmDraftComment();
|
|
||||||
})();
|
|
||||||
}
|
|
||||||
|
|
||||||
$(this).parent().find('.item').each(function () {
|
|
||||||
$(this).removeClass('checked');
|
|
||||||
$(this).find('.octicon-check').addClass('tw-invisible');
|
|
||||||
});
|
|
||||||
|
|
||||||
if (selector === 'select-assignees-modify') {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
$list.find('.item').each(function () {
|
|
||||||
$(this).addClass('tw-hidden');
|
|
||||||
});
|
|
||||||
$noSelect.removeClass('tw-hidden');
|
|
||||||
$($(this).parent().data('id')).val('');
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function selectItem(select_id, input_id) {
|
|
||||||
const $menu = $(`${select_id} .menu`);
|
|
||||||
const $list = $(`.ui${select_id}.list`);
|
|
||||||
const hasUpdateAction = $menu.data('action') === 'update';
|
|
||||||
|
|
||||||
$menu.find('.item:not(.no-select)').on('click', function () {
|
|
||||||
$(this).parent().find('.item').each(function () {
|
|
||||||
$(this).removeClass('selected active');
|
|
||||||
});
|
|
||||||
|
|
||||||
$(this).addClass('selected active');
|
|
||||||
if (hasUpdateAction) {
|
|
||||||
(async () => {
|
|
||||||
await updateIssuesMeta(
|
|
||||||
$menu.data('update-url'),
|
|
||||||
'',
|
|
||||||
$menu.data('issue-id'),
|
|
||||||
$(this).data('id'),
|
|
||||||
);
|
|
||||||
issueSidebarReloadConfirmDraftComment();
|
|
||||||
})();
|
|
||||||
}
|
|
||||||
|
|
||||||
let icon = '';
|
|
||||||
if (input_id === '#milestone_id') {
|
|
||||||
icon = svg('octicon-milestone', 18, 'tw-mr-2');
|
|
||||||
} else if (input_id === '#project_id') {
|
|
||||||
icon = svg('octicon-project', 18, 'tw-mr-2');
|
|
||||||
} else if (input_id === '#assignee_id') {
|
|
||||||
icon = `<img class="ui avatar image tw-mr-2" alt="avatar" src=${$(this).data('avatar')}>`;
|
|
||||||
}
|
|
||||||
|
|
||||||
$list.find('.selected').html(`
|
|
||||||
<a class="item muted sidebar-item-link" href="${htmlEscape(this.getAttribute('data-href'))}">
|
|
||||||
${icon}
|
|
||||||
${htmlEscape(this.textContent)}
|
|
||||||
</a>
|
|
||||||
`);
|
|
||||||
|
|
||||||
$(`.ui${select_id}.list .no-select`).addClass('tw-hidden');
|
|
||||||
$(input_id).val($(this).data('id'));
|
|
||||||
});
|
|
||||||
$menu.find('.no-select.item').on('click', function () {
|
|
||||||
$(this).parent().find('.item:not(.no-select)').each(function () {
|
|
||||||
$(this).removeClass('selected active');
|
|
||||||
});
|
|
||||||
|
|
||||||
if (hasUpdateAction) {
|
|
||||||
(async () => {
|
|
||||||
await updateIssuesMeta(
|
|
||||||
$menu.data('update-url'),
|
|
||||||
'',
|
|
||||||
$menu.data('issue-id'),
|
|
||||||
$(this).data('id'),
|
|
||||||
);
|
|
||||||
issueSidebarReloadConfirmDraftComment();
|
|
||||||
})();
|
|
||||||
}
|
|
||||||
|
|
||||||
$list.find('.selected').html('');
|
|
||||||
$list.find('.no-select').removeClass('tw-hidden');
|
|
||||||
$(input_id).val('');
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function initRepoIssueDue() {
|
function initRepoIssueDue() {
|
||||||
const form = document.querySelector<HTMLFormElement>('.issue-due-form');
|
const form = document.querySelector<HTMLFormElement>('.issue-due-form');
|
||||||
if (!form) return;
|
if (!form) return;
|
||||||
|
@ -257,14 +48,6 @@ export function initRepoIssueSidebar() {
|
||||||
initBranchSelector();
|
initBranchSelector();
|
||||||
initRepoIssueDue();
|
initRepoIssueDue();
|
||||||
|
|
||||||
// TODO: refactor the legacy initListSubmits&selectItem to initIssueSidebarComboList
|
// init the combo list: a dropdown for selecting items, and a list for showing selected items and related actions
|
||||||
initListSubmits('select-label', 'labels');
|
queryElems<HTMLElement>(document, '.issue-sidebar-combo', (el) => initIssueSidebarComboList(el));
|
||||||
initListSubmits('select-assignees', 'assignees');
|
|
||||||
initListSubmits('select-assignees-modify', 'assignees');
|
|
||||||
selectItem('.select-project', '#project_id');
|
|
||||||
selectItem('.select-milestone', '#milestone_id');
|
|
||||||
selectItem('.select-assignee', '#assignee_id');
|
|
||||||
|
|
||||||
// init the combo list: a dropdown for selecting reviewers, and a list for showing selected reviewers and related actions
|
|
||||||
initIssueSidebarComboList(document.querySelector('.issue-sidebar-combo[data-sidebar-combo-for="reviewers"]'));
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -98,6 +98,7 @@ export function initRepoIssueSidebarList() {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// FIXME: it is wrong place to init ".ui.dropdown.label-filter"
|
||||||
$('.menu .ui.dropdown.label-filter').on('keydown', (e) => {
|
$('.menu .ui.dropdown.label-filter').on('keydown', (e) => {
|
||||||
if (e.altKey && e.key === 'Enter') {
|
if (e.altKey && e.key === 'Enter') {
|
||||||
const selectedItem = document.querySelector('.menu .ui.dropdown.label-filter .menu .item.selected');
|
const selectedItem = document.querySelector('.menu .ui.dropdown.label-filter .menu .item.selected');
|
||||||
|
@ -106,7 +107,6 @@ export function initRepoIssueSidebarList() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
$('.ui.dropdown.label-filter, .ui.dropdown.select-label').dropdown('setting', {'hideDividers': 'empty'}).dropdown('refreshItems');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export function initRepoIssueCommentDelete() {
|
export function initRepoIssueCommentDelete() {
|
||||||
|
@ -652,19 +652,6 @@ function initIssueTemplateCommentEditors($commentForm) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// This function used to show and hide archived label on issue/pr
|
|
||||||
// page in the sidebar where we select the labels
|
|
||||||
// If we have any archived label tagged to issue and pr. We will show that
|
|
||||||
// archived label with checked classed otherwise we will hide it
|
|
||||||
// with the help of this function.
|
|
||||||
// This function runs globally.
|
|
||||||
export function initArchivedLabelHandler() {
|
|
||||||
if (!document.querySelector('.archived-label-hint')) return;
|
|
||||||
for (const label of document.querySelectorAll('[data-is-archived]')) {
|
|
||||||
toggleElem(label, label.classList.contains('checked'));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function initRepoCommentFormAndSidebar() {
|
export function initRepoCommentFormAndSidebar() {
|
||||||
const $commentForm = $('.comment.form');
|
const $commentForm = $('.comment.form');
|
||||||
if (!$commentForm.length) return;
|
if (!$commentForm.length) return;
|
||||||
|
|
|
@ -30,7 +30,7 @@ import {
|
||||||
initRepoIssueWipTitle,
|
initRepoIssueWipTitle,
|
||||||
initRepoPullRequestMergeInstruction,
|
initRepoPullRequestMergeInstruction,
|
||||||
initRepoPullRequestAllowMaintainerEdit,
|
initRepoPullRequestAllowMaintainerEdit,
|
||||||
initRepoPullRequestReview, initRepoIssueSidebarList, initArchivedLabelHandler,
|
initRepoPullRequestReview, initRepoIssueSidebarList,
|
||||||
} from './features/repo-issue.ts';
|
} from './features/repo-issue.ts';
|
||||||
import {initRepoEllipsisButton, initCommitStatuses} from './features/repo-commit.ts';
|
import {initRepoEllipsisButton, initCommitStatuses} from './features/repo-commit.ts';
|
||||||
import {initRepoTopicBar} from './features/repo-home.ts';
|
import {initRepoTopicBar} from './features/repo-home.ts';
|
||||||
|
@ -183,7 +183,6 @@ onDomReady(() => {
|
||||||
initRepoIssueContentHistory,
|
initRepoIssueContentHistory,
|
||||||
initRepoIssueList,
|
initRepoIssueList,
|
||||||
initRepoIssueSidebarList,
|
initRepoIssueSidebarList,
|
||||||
initArchivedLabelHandler,
|
|
||||||
initRepoIssueReferenceRepositorySearch,
|
initRepoIssueReferenceRepositorySearch,
|
||||||
initRepoIssueTimeTracking,
|
initRepoIssueTimeTracking,
|
||||||
initRepoIssueWipTitle,
|
initRepoIssueWipTitle,
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
import {svg} from '../svg.ts';
|
import {svg} from '../svg.ts';
|
||||||
|
|
||||||
const addPrefix = (str) => `user-content-${str}`;
|
const addPrefix = (str: string): string => `user-content-${str}`;
|
||||||
const removePrefix = (str) => str.replace(/^user-content-/, '');
|
const removePrefix = (str: string): string => str.replace(/^user-content-/, '');
|
||||||
const hasPrefix = (str) => str.startsWith('user-content-');
|
const hasPrefix = (str: string): boolean => str.startsWith('user-content-');
|
||||||
|
|
||||||
// scroll to anchor while respecting the `user-content` prefix that exists on the target
|
// scroll to anchor while respecting the `user-content` prefix that exists on the target
|
||||||
function scrollToAnchor(encodedId) {
|
function scrollToAnchor(encodedId: string): void {
|
||||||
if (!encodedId) return;
|
if (!encodedId) return;
|
||||||
const id = decodeURIComponent(encodedId);
|
const id = decodeURIComponent(encodedId);
|
||||||
const prefixedId = addPrefix(id);
|
const prefixedId = addPrefix(id);
|
||||||
|
@ -24,7 +24,7 @@ function scrollToAnchor(encodedId) {
|
||||||
el?.scrollIntoView();
|
el?.scrollIntoView();
|
||||||
}
|
}
|
||||||
|
|
||||||
export function initMarkupAnchors() {
|
export function initMarkupAnchors(): void {
|
||||||
const markupEls = document.querySelectorAll('.markup');
|
const markupEls = document.querySelectorAll('.markup');
|
||||||
if (!markupEls.length) return;
|
if (!markupEls.length) return;
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@ export function initMarkupAnchors() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// remove `user-content-` prefix from links so they don't show in url bar when clicked
|
// remove `user-content-` prefix from links so they don't show in url bar when clicked
|
||||||
for (const a of markupEl.querySelectorAll('a[href^="#"]')) {
|
for (const a of markupEl.querySelectorAll<HTMLAnchorElement>('a[href^="#"]')) {
|
||||||
const href = a.getAttribute('href');
|
const href = a.getAttribute('href');
|
||||||
if (!href.startsWith('#user-content-')) continue;
|
if (!href.startsWith('#user-content-')) continue;
|
||||||
a.setAttribute('href', `#${removePrefix(href.substring(1))}`);
|
a.setAttribute('href', `#${removePrefix(href.substring(1))}`);
|
||||||
|
@ -47,15 +47,15 @@ export function initMarkupAnchors() {
|
||||||
|
|
||||||
// add `user-content-` prefix to user-generated `a[name]` link targets
|
// add `user-content-` prefix to user-generated `a[name]` link targets
|
||||||
// TODO: this prefix should be added in backend instead
|
// TODO: this prefix should be added in backend instead
|
||||||
for (const a of markupEl.querySelectorAll('a[name]')) {
|
for (const a of markupEl.querySelectorAll<HTMLAnchorElement>('a[name]')) {
|
||||||
const name = a.getAttribute('name');
|
const name = a.getAttribute('name');
|
||||||
if (!name) continue;
|
if (!name) continue;
|
||||||
a.setAttribute('name', addPrefix(a.name));
|
a.setAttribute('name', addPrefix(name));
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const a of markupEl.querySelectorAll('a[href^="#"]')) {
|
for (const a of markupEl.querySelectorAll<HTMLAnchorElement>('a[href^="#"]')) {
|
||||||
a.addEventListener('click', (e) => {
|
a.addEventListener('click', (e) => {
|
||||||
scrollToAnchor(e.currentTarget.getAttribute('href')?.substring(1));
|
scrollToAnchor((e.currentTarget as HTMLAnchorElement).getAttribute('href')?.substring(1));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
import {svg} from '../svg.ts';
|
import {svg} from '../svg.ts';
|
||||||
|
|
||||||
export function makeCodeCopyButton() {
|
export function makeCodeCopyButton(): HTMLButtonElement {
|
||||||
const button = document.createElement('button');
|
const button = document.createElement('button');
|
||||||
button.classList.add('code-copy', 'ui', 'button');
|
button.classList.add('code-copy', 'ui', 'button');
|
||||||
button.innerHTML = svg('octicon-copy');
|
button.innerHTML = svg('octicon-copy');
|
||||||
return button;
|
return button;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function renderCodeCopy() {
|
export function renderCodeCopy(): void {
|
||||||
const els = document.querySelectorAll('.markup .code-block code');
|
const els = document.querySelectorAll('.markup .code-block code');
|
||||||
if (!els.length) return;
|
if (!els.length) return;
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
export function displayError(el, err) {
|
export function displayError(el: Element, err: Error): void {
|
||||||
el.classList.remove('is-loading');
|
el.classList.remove('is-loading');
|
||||||
const errorNode = document.createElement('pre');
|
const errorNode = document.createElement('pre');
|
||||||
errorNode.setAttribute('class', 'ui message error markup-block-error');
|
errorNode.setAttribute('class', 'ui message error markup-block-error');
|
||||||
errorNode.textContent = err.str || err.message || String(err);
|
errorNode.textContent = err.message || String(err);
|
||||||
el.before(errorNode);
|
el.before(errorNode);
|
||||||
el.setAttribute('data-render-done', 'true');
|
el.setAttribute('data-render-done', 'true');
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@ import {renderAsciicast} from './asciicast.ts';
|
||||||
import {initMarkupTasklist} from './tasklist.ts';
|
import {initMarkupTasklist} from './tasklist.ts';
|
||||||
|
|
||||||
// code that runs for all markup content
|
// code that runs for all markup content
|
||||||
export function initMarkupContent() {
|
export function initMarkupContent(): void {
|
||||||
renderMermaid();
|
renderMermaid();
|
||||||
renderMath();
|
renderMath();
|
||||||
renderCodeCopy();
|
renderCodeCopy();
|
||||||
|
@ -13,6 +13,6 @@ export function initMarkupContent() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// code that only runs for comments
|
// code that only runs for comments
|
||||||
export function initCommentContent() {
|
export function initCommentContent(): void {
|
||||||
initMarkupTasklist();
|
initMarkupTasklist();
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,21 +12,20 @@ type ProcessorContext = {
|
||||||
|
|
||||||
function prepareProcessors(ctx:ProcessorContext): Processors {
|
function prepareProcessors(ctx:ProcessorContext): Processors {
|
||||||
const processors = {
|
const processors = {
|
||||||
H1(el) {
|
H1(el: HTMLHeadingElement) {
|
||||||
const level = parseInt(el.tagName.slice(1));
|
const level = parseInt(el.tagName.slice(1));
|
||||||
el.textContent = `${'#'.repeat(level)} ${el.textContent.trim()}`;
|
el.textContent = `${'#'.repeat(level)} ${el.textContent.trim()}`;
|
||||||
},
|
},
|
||||||
STRONG(el) {
|
STRONG(el: HTMLElement) {
|
||||||
return `**${el.textContent}**`;
|
return `**${el.textContent}**`;
|
||||||
},
|
},
|
||||||
EM(el) {
|
EM(el: HTMLElement) {
|
||||||
return `_${el.textContent}_`;
|
return `_${el.textContent}_`;
|
||||||
},
|
},
|
||||||
DEL(el) {
|
DEL(el: HTMLElement) {
|
||||||
return `~~${el.textContent}~~`;
|
return `~~${el.textContent}~~`;
|
||||||
},
|
},
|
||||||
|
A(el: HTMLAnchorElement) {
|
||||||
A(el) {
|
|
||||||
const text = el.textContent || 'link';
|
const text = el.textContent || 'link';
|
||||||
const href = el.getAttribute('href');
|
const href = el.getAttribute('href');
|
||||||
if (/^https?:/.test(text) && text === href) {
|
if (/^https?:/.test(text) && text === href) {
|
||||||
|
@ -34,7 +33,7 @@ function prepareProcessors(ctx:ProcessorContext): Processors {
|
||||||
}
|
}
|
||||||
return href ? `[${text}](${href})` : text;
|
return href ? `[${text}](${href})` : text;
|
||||||
},
|
},
|
||||||
IMG(el) {
|
IMG(el: HTMLImageElement) {
|
||||||
const alt = el.getAttribute('alt') || 'image';
|
const alt = el.getAttribute('alt') || 'image';
|
||||||
const src = el.getAttribute('src');
|
const src = el.getAttribute('src');
|
||||||
const widthAttr = el.hasAttribute('width') ? ` width="${htmlEscape(el.getAttribute('width') || '')}"` : '';
|
const widthAttr = el.hasAttribute('width') ? ` width="${htmlEscape(el.getAttribute('width') || '')}"` : '';
|
||||||
|
@ -44,32 +43,29 @@ function prepareProcessors(ctx:ProcessorContext): Processors {
|
||||||
}
|
}
|
||||||
return `![${alt}](${src})`;
|
return `![${alt}](${src})`;
|
||||||
},
|
},
|
||||||
|
P(el: HTMLParagraphElement) {
|
||||||
P(el) {
|
|
||||||
el.textContent = `${el.textContent}\n`;
|
el.textContent = `${el.textContent}\n`;
|
||||||
},
|
},
|
||||||
BLOCKQUOTE(el) {
|
BLOCKQUOTE(el: HTMLElement) {
|
||||||
el.textContent = `${el.textContent.replace(/^/mg, '> ')}\n`;
|
el.textContent = `${el.textContent.replace(/^/mg, '> ')}\n`;
|
||||||
},
|
},
|
||||||
|
OL(el: HTMLElement) {
|
||||||
OL(el) {
|
|
||||||
const preNewLine = ctx.listNestingLevel ? '\n' : '';
|
const preNewLine = ctx.listNestingLevel ? '\n' : '';
|
||||||
el.textContent = `${preNewLine}${el.textContent}\n`;
|
el.textContent = `${preNewLine}${el.textContent}\n`;
|
||||||
},
|
},
|
||||||
LI(el) {
|
LI(el: HTMLElement) {
|
||||||
const parent = el.parentNode;
|
const parent = el.parentNode;
|
||||||
const bullet = parent.tagName === 'OL' ? `1. ` : '* ';
|
const bullet = (parent as HTMLElement).tagName === 'OL' ? `1. ` : '* ';
|
||||||
const nestingIdentLevel = Math.max(0, ctx.listNestingLevel - 1);
|
const nestingIdentLevel = Math.max(0, ctx.listNestingLevel - 1);
|
||||||
el.textContent = `${' '.repeat(nestingIdentLevel * 4)}${bullet}${el.textContent}${ctx.elementIsLast ? '' : '\n'}`;
|
el.textContent = `${' '.repeat(nestingIdentLevel * 4)}${bullet}${el.textContent}${ctx.elementIsLast ? '' : '\n'}`;
|
||||||
return el;
|
return el;
|
||||||
},
|
},
|
||||||
INPUT(el) {
|
INPUT(el: HTMLInputElement) {
|
||||||
return el.checked ? '[x] ' : '[ ] ';
|
return el.checked ? '[x] ' : '[ ] ';
|
||||||
},
|
},
|
||||||
|
CODE(el: HTMLElement) {
|
||||||
CODE(el) {
|
|
||||||
const text = el.textContent;
|
const text = el.textContent;
|
||||||
if (el.parentNode && el.parentNode.tagName === 'PRE') {
|
if (el.parentNode && (el.parentNode as HTMLElement).tagName === 'PRE') {
|
||||||
el.textContent = `\`\`\`\n${text}\n\`\`\`\n`;
|
el.textContent = `\`\`\`\n${text}\n\`\`\`\n`;
|
||||||
return el;
|
return el;
|
||||||
}
|
}
|
||||||
|
@ -86,7 +82,7 @@ function prepareProcessors(ctx:ProcessorContext): Processors {
|
||||||
return processors;
|
return processors;
|
||||||
}
|
}
|
||||||
|
|
||||||
function processElement(ctx :ProcessorContext, processors: Processors, el: HTMLElement) {
|
function processElement(ctx :ProcessorContext, processors: Processors, el: HTMLElement): string | void {
|
||||||
if (el.hasAttribute('data-markdown-generated-content')) return el.textContent;
|
if (el.hasAttribute('data-markdown-generated-content')) return el.textContent;
|
||||||
if (el.tagName === 'A' && el.children.length === 1 && el.children[0].tagName === 'IMG') {
|
if (el.tagName === 'A' && el.children.length === 1 && el.children[0].tagName === 'IMG') {
|
||||||
return processElement(ctx, processors, el.children[0] as HTMLElement);
|
return processElement(ctx, processors, el.children[0] as HTMLElement);
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
import {displayError} from './common.ts';
|
import {displayError} from './common.ts';
|
||||||
|
|
||||||
function targetElement(el) {
|
function targetElement(el: Element) {
|
||||||
// The target element is either the current element if it has the
|
// The target element is either the current element if it has the
|
||||||
// `is-loading` class or the pre that contains it
|
// `is-loading` class or the pre that contains it
|
||||||
return el.classList.contains('is-loading') ? el : el.closest('pre');
|
return el.classList.contains('is-loading') ? el : el.closest('pre');
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function renderMath() {
|
export async function renderMath(): void {
|
||||||
const els = document.querySelectorAll('.markup code.language-math');
|
const els = document.querySelectorAll('.markup code.language-math');
|
||||||
if (!els.length) return;
|
if (!els.length) return;
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ body {margin: 0; padding: 0; overflow: hidden}
|
||||||
#mermaid {display: block; margin: 0 auto}
|
#mermaid {display: block; margin: 0 auto}
|
||||||
blockquote, dd, dl, figure, h1, h2, h3, h4, h5, h6, hr, p, pre {margin: 0}`;
|
blockquote, dd, dl, figure, h1, h2, h3, h4, h5, h6, hr, p, pre {margin: 0}`;
|
||||||
|
|
||||||
export async function renderMermaid() {
|
export async function renderMermaid(): Promise<void> {
|
||||||
const els = document.querySelectorAll('.markup code.language-mermaid');
|
const els = document.querySelectorAll('.markup code.language-mermaid');
|
||||||
if (!els.length) return;
|
if (!els.length) return;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import {POST} from '../modules/fetch.ts';
|
import {POST} from '../modules/fetch.ts';
|
||||||
import {showErrorToast} from '../modules/toast.ts';
|
import {showErrorToast} from '../modules/toast.ts';
|
||||||
|
|
||||||
const preventListener = (e) => e.preventDefault();
|
const preventListener = (e: Event) => e.preventDefault();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Attaches `input` handlers to markdown rendered tasklist checkboxes in comments.
|
* Attaches `input` handlers to markdown rendered tasklist checkboxes in comments.
|
||||||
|
@ -10,10 +10,10 @@ const preventListener = (e) => e.preventDefault();
|
||||||
* is set accordingly and sent to the server. On success it updates the raw-content on
|
* is set accordingly and sent to the server. On success it updates the raw-content on
|
||||||
* error it resets the checkbox to its original value.
|
* error it resets the checkbox to its original value.
|
||||||
*/
|
*/
|
||||||
export function initMarkupTasklist() {
|
export function initMarkupTasklist(): void {
|
||||||
for (const el of document.querySelectorAll(`.markup[data-can-edit=true]`) || []) {
|
for (const el of document.querySelectorAll(`.markup[data-can-edit=true]`) || []) {
|
||||||
const container = el.parentNode;
|
const container = el.parentNode;
|
||||||
const checkboxes = el.querySelectorAll(`.task-list-item input[type=checkbox]`);
|
const checkboxes = el.querySelectorAll<HTMLInputElement>(`.task-list-item input[type=checkbox]`);
|
||||||
|
|
||||||
for (const checkbox of checkboxes) {
|
for (const checkbox of checkboxes) {
|
||||||
if (checkbox.hasAttribute('data-editable')) {
|
if (checkbox.hasAttribute('data-editable')) {
|
||||||
|
@ -52,7 +52,7 @@ export function initMarkupTasklist() {
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const editContentZone = container.querySelector('.edit-content-zone');
|
const editContentZone = container.querySelector<HTMLDivElement>('.edit-content-zone');
|
||||||
const updateUrl = editContentZone.getAttribute('data-update-url');
|
const updateUrl = editContentZone.getAttribute('data-update-url');
|
||||||
const context = editContentZone.getAttribute('data-context');
|
const context = editContentZone.getAttribute('data-context');
|
||||||
const contentVersion = editContentZone.getAttribute('data-content-version');
|
const contentVersion = editContentZone.getAttribute('data-content-version');
|
||||||
|
|
|
@ -155,7 +155,7 @@ export type SvgName = keyof typeof svgs;
|
||||||
// most of the SVG icons in assets couldn't be used directly.
|
// most of the SVG icons in assets couldn't be used directly.
|
||||||
|
|
||||||
// retrieve an HTML string for given SVG icon name, size and additional classes
|
// retrieve an HTML string for given SVG icon name, size and additional classes
|
||||||
export function svg(name: SvgName, size = 16, classNames: string|string[]): string {
|
export function svg(name: SvgName, size = 16, classNames?: string|string[]): string {
|
||||||
const className = Array.isArray(classNames) ? classNames.join(' ') : classNames;
|
const className = Array.isArray(classNames) ? classNames.join(' ') : classNames;
|
||||||
if (!(name in svgs)) throw new Error(`Unknown SVG icon: ${name}`);
|
if (!(name in svgs)) throw new Error(`Unknown SVG icon: ${name}`);
|
||||||
if (size === 16 && !className) return svgs[name];
|
if (size === 16 && !className) return svgs[name];
|
||||||
|
|
|
@ -3,7 +3,7 @@ import type {Promisable} from 'type-fest';
|
||||||
import type $ from 'jquery';
|
import type $ from 'jquery';
|
||||||
|
|
||||||
type ElementArg = Element | string | NodeListOf<Element> | Array<Element> | ReturnType<typeof $>;
|
type ElementArg = Element | string | NodeListOf<Element> | Array<Element> | ReturnType<typeof $>;
|
||||||
type ElementsCallback = (el: Element) => Promisable<any>;
|
type ElementsCallback<T extends Element> = (el: T) => Promisable<any>;
|
||||||
type ElementsCallbackWithArgs = (el: Element, ...args: any[]) => Promisable<any>;
|
type ElementsCallbackWithArgs = (el: Element, ...args: any[]) => Promisable<any>;
|
||||||
type ArrayLikeIterable<T> = ArrayLike<T> & Iterable<T>; // for NodeListOf and Array
|
type ArrayLikeIterable<T> = ArrayLike<T> & Iterable<T>; // for NodeListOf and Array
|
||||||
|
|
||||||
|
@ -58,7 +58,7 @@ export function isElemHidden(el: ElementArg) {
|
||||||
return res[0];
|
return res[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
function applyElemsCallback<T extends Element>(elems: ArrayLikeIterable<T>, fn?: ElementsCallback): ArrayLikeIterable<T> {
|
function applyElemsCallback<T extends Element>(elems: ArrayLikeIterable<T>, fn?: ElementsCallback<T>): ArrayLikeIterable<T> {
|
||||||
if (fn) {
|
if (fn) {
|
||||||
for (const el of elems) {
|
for (const el of elems) {
|
||||||
fn(el);
|
fn(el);
|
||||||
|
@ -67,7 +67,7 @@ function applyElemsCallback<T extends Element>(elems: ArrayLikeIterable<T>, fn?:
|
||||||
return elems;
|
return elems;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function queryElemSiblings<T extends Element>(el: Element, selector = '*', fn?: ElementsCallback): ArrayLikeIterable<T> {
|
export function queryElemSiblings<T extends Element>(el: Element, selector = '*', fn?: ElementsCallback<T>): ArrayLikeIterable<T> {
|
||||||
const elems = Array.from(el.parentNode.children) as T[];
|
const elems = Array.from(el.parentNode.children) as T[];
|
||||||
return applyElemsCallback<T>(elems.filter((child: Element) => {
|
return applyElemsCallback<T>(elems.filter((child: Element) => {
|
||||||
return child !== el && child.matches(selector);
|
return child !== el && child.matches(selector);
|
||||||
|
@ -75,13 +75,13 @@ export function queryElemSiblings<T extends Element>(el: Element, selector = '*'
|
||||||
}
|
}
|
||||||
|
|
||||||
// it works like jQuery.children: only the direct children are selected
|
// it works like jQuery.children: only the direct children are selected
|
||||||
export function queryElemChildren<T extends Element>(parent: Element | ParentNode, selector = '*', fn?: ElementsCallback): ArrayLikeIterable<T> {
|
export function queryElemChildren<T extends Element>(parent: Element | ParentNode, selector = '*', fn?: ElementsCallback<T>): ArrayLikeIterable<T> {
|
||||||
return applyElemsCallback<T>(parent.querySelectorAll(`:scope > ${selector}`), fn);
|
return applyElemsCallback<T>(parent.querySelectorAll(`:scope > ${selector}`), fn);
|
||||||
}
|
}
|
||||||
|
|
||||||
// it works like parent.querySelectorAll: all descendants are selected
|
// it works like parent.querySelectorAll: all descendants are selected
|
||||||
// in the future, all "queryElems(document, ...)" should be refactored to use a more specific parent
|
// in the future, all "queryElems(document, ...)" should be refactored to use a more specific parent
|
||||||
export function queryElems<T extends Element>(parent: Element | ParentNode, selector: string, fn?: ElementsCallback): ArrayLikeIterable<T> {
|
export function queryElems<T extends Element>(parent: Element | ParentNode, selector: string, fn?: ElementsCallback<T>): ArrayLikeIterable<T> {
|
||||||
return applyElemsCallback<T>(parent.querySelectorAll(selector), fn);
|
return applyElemsCallback<T>(parent.querySelectorAll(selector), fn);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue