diff --git a/changelog.md b/changelog.md index ba228fa641..10167c3ca8 100644 --- a/changelog.md +++ b/changelog.md @@ -11,6 +11,7 @@ Platform: - Fix skills/labels activity - Project selector in issue list - Save last filter for page +- Project issue list view HR: diff --git a/models/tracker/src/index.ts b/models/tracker/src/index.ts index 422b9a384c..e587e596ab 100644 --- a/models/tracker/src/index.ts +++ b/models/tracker/src/index.ts @@ -212,7 +212,7 @@ export class TProject extends TDoc implements Project { // @Index(IndexKind.FullText) label!: string - @Prop(TypeMarkup(), tracker.string.Project) + @Prop(TypeMarkup(), tracker.string.Description) description?: Markup @Prop(TypeString(), tracker.string.AssetLabel) @@ -236,10 +236,10 @@ export class TProject extends TDoc implements Project { @Prop(Collection(attachment.class.Attachment), attachment.string.Attachments, undefined, attachment.string.Files) attachments?: number - @Prop(TypeDate(true), tracker.string.Project) + @Prop(TypeDate(true), tracker.string.StartDate) startDate!: Timestamp | null - @Prop(TypeDate(true), tracker.string.Project) + @Prop(TypeDate(true), tracker.string.TargetDate) targetDate!: Timestamp | null declare space: Ref @@ -364,6 +364,12 @@ export function createModel (builder: Builder): void { label: tracker.string.Views, icon: tracker.icon.Views, component: tracker.component.Views + }, + { + id: 'project', + label: tracker.string.Project, + component: tracker.component.EditProject, + visibleIf: tracker.function.ProjectVisible } ], spaces: [ diff --git a/plugins/tracker-assets/lang/en.json b/plugins/tracker-assets/lang/en.json index 85fcd90d04..087420a13f 100644 --- a/plugins/tracker-assets/lang/en.json +++ b/plugins/tracker-assets/lang/en.json @@ -58,7 +58,7 @@ "CategoryCanceled": "Canceled", "Title": "Title", - "Description": "", + "Description": "Description", "Status": "Status", "Number": "Number", "Assignee": "Assignee", diff --git a/plugins/tracker-assets/lang/ru.json b/plugins/tracker-assets/lang/ru.json index ee48dc2f8c..60f00bb83c 100644 --- a/plugins/tracker-assets/lang/ru.json +++ b/plugins/tracker-assets/lang/ru.json @@ -49,7 +49,7 @@ "AddSubIssues": "{subIssues, plural, =1 {Добавить подзадачу} other {+ Добавить подзадачи}}", "Title": "Заголовок", - "Description": "", + "Description": "Описание", "Status": "Статус", "Number": "Number", "Assignee": "Исполнитель", diff --git a/plugins/tracker-resources/src/components/issues/Issues.svelte b/plugins/tracker-resources/src/components/issues/Issues.svelte index f4cff77853..418dc55289 100644 --- a/plugins/tracker-resources/src/components/issues/Issues.svelte +++ b/plugins/tracker-resources/src/components/issues/Issues.svelte @@ -65,6 +65,7 @@ export let completedIssuesPeriod: IssuesDateModificationPeriod | null = IssuesDateModificationPeriod.All export let shouldShowEmptyGroups: boolean | undefined = false export let includedGroups: Partial>> = {} + export let label: string | undefined = undefined const dispatch = createEventDispatcher() const ENTRIES_LIMIT = 200 @@ -439,18 +440,16 @@ filterElement ) } + $: value = totalIssuesCount === resultIssuesCount ? totalIssuesCount : `${resultIssuesCount}/${totalIssuesCount}` {#if currentTeam}
- {#if totalIssuesCount === resultIssuesCount} -