mirror of https://github.com/go-gitea/gitea.git
parent
857243bed7
commit
9a93b1816e
|
@ -116,12 +116,17 @@ func (l *Label) CalOpenIssues() {
|
||||||
func (l *Label) SetArchived(isArchived bool) {
|
func (l *Label) SetArchived(isArchived bool) {
|
||||||
if !isArchived {
|
if !isArchived {
|
||||||
l.ArchivedUnix = timeutil.TimeStamp(0)
|
l.ArchivedUnix = timeutil.TimeStamp(0)
|
||||||
} else if isArchived && l.ArchivedUnix.IsZero() {
|
} else if isArchived && !l.IsArchived() {
|
||||||
// Only change the date when it is newly archived.
|
// Only change the date when it is newly archived.
|
||||||
l.ArchivedUnix = timeutil.TimeStampNow()
|
l.ArchivedUnix = timeutil.TimeStampNow()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// IsArchived returns true if label is an archived
|
||||||
|
func (l *Label) IsArchived() bool {
|
||||||
|
return !l.ArchivedUnix.IsZero()
|
||||||
|
}
|
||||||
|
|
||||||
// CalOpenOrgIssues calculates the open issues of a label for a specific repo
|
// CalOpenOrgIssues calculates the open issues of a label for a specific repo
|
||||||
func (l *Label) CalOpenOrgIssues(ctx context.Context, repoID, labelID int64) {
|
func (l *Label) CalOpenOrgIssues(ctx context.Context, repoID, labelID int64) {
|
||||||
counts, _ := CountIssuesByRepo(ctx, &IssuesOptions{
|
counts, _ := CountIssuesByRepo(ctx, &IssuesOptions{
|
||||||
|
@ -166,11 +171,6 @@ func (l *Label) BelongsToOrg() bool {
|
||||||
return l.OrgID > 0
|
return l.OrgID > 0
|
||||||
}
|
}
|
||||||
|
|
||||||
// IsArchived returns true if label is an archived
|
|
||||||
func (l *Label) IsArchived() bool {
|
|
||||||
return l.ArchivedUnix > 0
|
|
||||||
}
|
|
||||||
|
|
||||||
// BelongsToRepo returns true if label is a repository label
|
// BelongsToRepo returns true if label is a repository label
|
||||||
func (l *Label) BelongsToRepo() bool {
|
func (l *Label) BelongsToRepo() bool {
|
||||||
return l.RepoID > 0
|
return l.RepoID > 0
|
||||||
|
|
|
@ -124,7 +124,6 @@ func RenderLabel(ctx context.Context, locale translation.Locale, label *issues_m
|
||||||
var (
|
var (
|
||||||
archivedCSSClass string
|
archivedCSSClass string
|
||||||
textColor = "#111"
|
textColor = "#111"
|
||||||
isArchived = !label.ArchivedUnix.IsZero()
|
|
||||||
labelScope = label.ExclusiveScope()
|
labelScope = label.ExclusiveScope()
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -136,7 +135,7 @@ func RenderLabel(ctx context.Context, locale translation.Locale, label *issues_m
|
||||||
|
|
||||||
description := emoji.ReplaceAliases(template.HTMLEscapeString(label.Description))
|
description := emoji.ReplaceAliases(template.HTMLEscapeString(label.Description))
|
||||||
|
|
||||||
if isArchived {
|
if label.IsArchived() {
|
||||||
archivedCSSClass = "archived-label"
|
archivedCSSClass = "archived-label"
|
||||||
description = fmt.Sprintf("(%s) %s", locale.TrString("archived"), description)
|
description = fmt.Sprintf("(%s) %s", locale.TrString("archived"), description)
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,6 @@ import (
|
||||||
"code.gitea.io/gitea/modules/label"
|
"code.gitea.io/gitea/modules/label"
|
||||||
"code.gitea.io/gitea/modules/log"
|
"code.gitea.io/gitea/modules/log"
|
||||||
repo_module "code.gitea.io/gitea/modules/repository"
|
repo_module "code.gitea.io/gitea/modules/repository"
|
||||||
"code.gitea.io/gitea/modules/timeutil"
|
|
||||||
"code.gitea.io/gitea/modules/web"
|
"code.gitea.io/gitea/modules/web"
|
||||||
"code.gitea.io/gitea/services/context"
|
"code.gitea.io/gitea/services/context"
|
||||||
"code.gitea.io/gitea/services/forms"
|
"code.gitea.io/gitea/services/forms"
|
||||||
|
@ -117,7 +116,6 @@ func NewLabel(ctx *context.Context) {
|
||||||
Exclusive: form.Exclusive,
|
Exclusive: form.Exclusive,
|
||||||
Description: form.Description,
|
Description: form.Description,
|
||||||
Color: form.Color,
|
Color: form.Color,
|
||||||
ArchivedUnix: timeutil.TimeStamp(0),
|
|
||||||
}
|
}
|
||||||
if err := issues_model.NewLabel(ctx, l); err != nil {
|
if err := issues_model.NewLabel(ctx, l); err != nil {
|
||||||
ctx.ServerError("NewLabel", err)
|
ctx.ServerError("NewLabel", err)
|
||||||
|
|
Loading…
Reference in New Issue