Skip to content

Commit 8f2f63e

Browse files
Merge branch 'develop' of https://github.com/hcengineering/platform into staging-new
2 parents 1a4aaf0 + a7599bb commit 8f2f63e

File tree

30 files changed

+733
-70
lines changed

30 files changed

+733
-70
lines changed

models/card/src/index.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ import {
2222
type CardViewDefaults,
2323
type CreateCardExtension,
2424
DOMAIN_CARD,
25+
type ExportExtension,
26+
type ExportFunc,
2527
type FavoriteCard,
2628
type FavoriteType,
2729
type MasterTag,
@@ -202,6 +204,11 @@ export class TCreateCardExtension extends TMasterTag implements CreateCardExtens
202204
canCreate?: CanCreateCardResource
203205
}
204206

207+
@Model(card.class.ExportExtension, core.class.Doc, DOMAIN_MODEL)
208+
export class TExportExtension extends TDoc implements ExportExtension {
209+
func!: Resource<ExportFunc>
210+
}
211+
205212
export * from './migration'
206213

207214
const listConfig: (BuildModelKey | string)[] = [
@@ -387,7 +394,8 @@ export function createModel (builder: Builder): void {
387394
TCardViewDefaults,
388395
TFavoriteCard,
389396
TFavoriteType,
390-
TCreateCardExtension
397+
TCreateCardExtension,
398+
TExportExtension
391399
)
392400

393401
builder.createDoc(

models/process/src/index.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,10 @@ export function createModel (builder: Builder): void {
606606
props: {}
607607
})
608608

609+
builder.createDoc(card.class.ExportExtension, core.space.Model, {
610+
func: process.function.ExportProcess
611+
})
612+
609613
builder.createDoc(
610614
card.class.CardSection,
611615
core.space.Model,

packages/presentation/src/components/DocPopup.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@
315315
<slot name="item" item={obj} />
316316
{/if}
317317
{#if (allowDeselect && selected) || multiSelect || selected}
318-
<div class="check" class:disabled={readonly}>
318+
<div class="check mr-2" class:disabled={readonly}>
319319
{#if obj._id === selected || selectedElements.has(obj._id)}
320320
{#if loading}
321321
<Spinner size={'small'} />

plugins/card-assets/lang/cs.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@
6868
"EnableVersioning": "Povolit verzování",
6969
"EnableVersioningConfirm": "Chcete povolit verzování?",
7070
"NewVersionConfirmation": "Chcete vytvořit novou verzi?",
71-
"RelationCopyDescr": "Které vztahy chcete zkopírovat?"
71+
"RelationCopyDescr": "Které vztahy chcete zkopírovat?",
72+
"Import": "Importovat",
73+
"Export": "Exportovat"
7274
}
7375
}

plugins/card-assets/lang/de.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@
6868
"EnableVersioning": "Versionsverwaltung aktivieren",
6969
"EnableVersioningConfirm": "Möchten Sie die Versionsverwaltung aktivieren?",
7070
"NewVersionConfirmation": "Möchten Sie eine neue Version erstellen?",
71-
"RelationCopyDescr": "Welche Beziehungen möchten Sie kopieren?"
71+
"RelationCopyDescr": "Welche Beziehungen möchten Sie kopieren?",
72+
"Import": "Importieren",
73+
"Export": "Exportieren"
7274
}
7375
}

plugins/card-assets/lang/en.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@
6868
"EnableVersioning": "Enable versioning",
6969
"EnableVersioningConfirm": "Do you want to enable versioning?",
7070
"NewVersionConfirmation": "Do you want to create a new version?",
71-
"RelationCopyDescr": "Which relations do you want to copy?"
71+
"RelationCopyDescr": "Which relations do you want to copy?",
72+
"Import": "Import",
73+
"Export": "Export"
7274
}
7375
}

plugins/card-assets/lang/es.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@
6868
"EnableVersioning": "Habilitar control de versiones",
6969
"EnableVersioningConfirm": "¿Desea habilitar el control de versiones?",
7070
"NewVersionConfirmation": "¿Desea crear una nueva versión?",
71-
"RelationCopyDescr": "¿Qué relaciones quieres copiar?"
71+
"RelationCopyDescr": "¿Qué relaciones quieres copiar?",
72+
"Import": "Importar",
73+
"Export": "Exportar"
7274
}
7375
}

plugins/card-assets/lang/fr.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@
6868
"EnableVersioning": "Activer la gestion des versions",
6969
"EnableVersioningConfirm": "Voulez-vous activer la gestion des versions ?",
7070
"NewVersionConfirmation": "Voulez-vous créer une nouvelle version ?",
71-
"RelationCopyDescr": "Quelles relations souhaitez-vous copier ?"
71+
"RelationCopyDescr": "Quelles relations souhaitez-vous copier ?",
72+
"Import": "Importer",
73+
"Export": "Exporter"
7274
}
7375
}

plugins/card-assets/lang/it.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@
6868
"EnableVersioning": "Abilita versionamento",
6969
"EnableVersioningConfirm": "Vuoi abilitare il versionamento?",
7070
"NewVersionConfirmation": "Vuoi creare una nuova versione?",
71-
"RelationCopyDescr": "Quali relazioni vuoi copiare?"
71+
"RelationCopyDescr": "Quali relazioni vuoi copiare?",
72+
"Import": "Importa",
73+
"Export": "Esporta"
7274
}
7375
}

plugins/card-assets/lang/ja.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@
6868
"EnableVersioning": "バージョン管理を有効にする",
6969
"EnableVersioningConfirm": "バージョン管理を有効にしますか?",
7070
"NewVersionConfirmation": "新しいバージョンを作成しますか?",
71-
"RelationCopyDescr": "どの関連をコピーしますか?"
71+
"RelationCopyDescr": "どの関連をコピーしますか?",
72+
"Import": "インポート",
73+
"Export": "エクスポート"
7274
}
7375
}

0 commit comments

Comments
 (0)