@@ -116,12 +116,17 @@ func (l *Label) CalOpenIssues() { | |||
func (l *Label) SetArchived(isArchived bool) { | |||
if !isArchived { | |||
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. | |||
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 | |||
func (l *Label) CalOpenOrgIssues(ctx context.Context, repoID, labelID int64) { | |||
counts, _ := CountIssuesByRepo(ctx, &IssuesOptions{ | |||
@@ -166,11 +171,6 @@ func (l *Label) BelongsToOrg() bool { | |||
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 | |||
func (l *Label) BelongsToRepo() bool { | |||
return l.RepoID > 0 |
@@ -124,7 +124,6 @@ func RenderLabel(ctx context.Context, locale translation.Locale, label *issues_m | |||
var ( | |||
archivedCSSClass string | |||
textColor = "#111" | |||
isArchived = !label.ArchivedUnix.IsZero() | |||
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)) | |||
if isArchived { | |||
if label.IsArchived() { | |||
archivedCSSClass = "archived-label" | |||
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/log" | |||
repo_module "code.gitea.io/gitea/modules/repository" | |||
"code.gitea.io/gitea/modules/timeutil" | |||
"code.gitea.io/gitea/modules/web" | |||
"code.gitea.io/gitea/services/context" | |||
"code.gitea.io/gitea/services/forms" | |||
@@ -112,12 +111,11 @@ func NewLabel(ctx *context.Context) { | |||
} | |||
l := &issues_model.Label{ | |||
RepoID: ctx.Repo.Repository.ID, | |||
Name: form.Title, | |||
Exclusive: form.Exclusive, | |||
Description: form.Description, | |||
Color: form.Color, | |||
ArchivedUnix: timeutil.TimeStamp(0), | |||
RepoID: ctx.Repo.Repository.ID, | |||
Name: form.Title, | |||
Exclusive: form.Exclusive, | |||
Description: form.Description, | |||
Color: form.Color, | |||
} | |||
if err := issues_model.NewLabel(ctx, l); err != nil { | |||
ctx.ServerError("NewLabel", err) |