From 8b4cb1568e95d2d8b5ebe2e72b0e1cb98ada3976 Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 27 Mar 2015 12:00:10 +0200 Subject: [PATCH] import dev --- application/Espo/Resources/i18n/en_US/Import.json | 12 +++++++++++- .../Espo/Resources/layouts/Import/detail.json | 12 ++++++++++++ application/Espo/Resources/layouts/Import/list.json | 5 +++++ .../Espo/Resources/metadata/entityDefs/Import.json | 7 ++++++- 4 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 application/Espo/Resources/layouts/Import/detail.json create mode 100644 application/Espo/Resources/layouts/Import/list.json diff --git a/application/Espo/Resources/i18n/en_US/Import.json b/application/Espo/Resources/i18n/en_US/Import.json index fbfa73608b..4044d43f75 100644 --- a/application/Espo/Resources/i18n/en_US/Import.json +++ b/application/Espo/Resources/i18n/en_US/Import.json @@ -10,9 +10,19 @@ "Created": "Created", "Updated": "Updated", "Result": "Result", - "Show records": "Show records" + "Show records": "Show records", + "Remove Duplicates": "Remove Duplicates" }, "messages": { "utf8": "Should be UTF-8 encoded" + }, + "fields": { + "file": "File", + "entityType": "Entity Type" + }, + "links": { + "imported": "Imported Records", + "duplicates": "Duplicate Records", + "updated": "Updated Records" } } diff --git a/application/Espo/Resources/layouts/Import/detail.json b/application/Espo/Resources/layouts/Import/detail.json new file mode 100644 index 0000000000..cfdf561011 --- /dev/null +++ b/application/Espo/Resources/layouts/Import/detail.json @@ -0,0 +1,12 @@ +[ + { + "rows": [ + [ + {"name": "entityType"} + ], + [ + {"name": "file"} + ] + ] + } +] diff --git a/application/Espo/Resources/layouts/Import/list.json b/application/Espo/Resources/layouts/Import/list.json new file mode 100644 index 0000000000..3f76b88513 --- /dev/null +++ b/application/Espo/Resources/layouts/Import/list.json @@ -0,0 +1,5 @@ +[ + {"name":"createdAt", "width":50, "link": true}, + {"name":"entityType"}, + {"name":"createdBy"} +] diff --git a/application/Espo/Resources/metadata/entityDefs/Import.json b/application/Espo/Resources/metadata/entityDefs/Import.json index 4cda4c6331..12eaebc9e8 100644 --- a/application/Espo/Resources/metadata/entityDefs/Import.json +++ b/application/Espo/Resources/metadata/entityDefs/Import.json @@ -1,7 +1,12 @@ { "fields": { "entityType": { - "type": "varchar", + "type": "enum", + "translation": "Global.scopeNames", + "required": true + }, + "file": { + "type": "file", "required": true }, "createdAt": {