From 3a22366617aa1bb15c5af5afb8b92bf3f259de9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20Kn=C3=B6chel?= Date: Sat, 1 Sep 2018 23:15:27 +0200 Subject: [PATCH 1/3] chore: add reference about production databases --- docs/3.x.x/en/guides/deployment.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/3.x.x/en/guides/deployment.md b/docs/3.x.x/en/guides/deployment.md index a082b1d2a2..0c698834e7 100644 --- a/docs/3.x.x/en/guides/deployment.md +++ b/docs/3.x.x/en/guides/deployment.md @@ -18,6 +18,9 @@ Update the `production` settings with the IP and domain name where the project w } ``` +In case your database is not running on the same server, make sure that the environment of your production +database (`./config/environments/production/database.json`) is set properly. + **⚠️ If you changed the path to access to the administration, the step #2 is required.** #### #2 - Setup (optional) From e96d04838189b46618f0079417eb7d32efb50f5a Mon Sep 17 00:00:00 2001 From: Vladislav Arsenev Date: Tue, 4 Sep 2018 17:57:10 +0300 Subject: [PATCH 2/3] fix: remove-old-files - fix lost file remove and one new was added --- .../strapi-plugin-content-manager/services/ContentManager.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/strapi-plugin-content-manager/services/ContentManager.js b/packages/strapi-plugin-content-manager/services/ContentManager.js index 9f001c6832..3bf15942e3 100644 --- a/packages/strapi-plugin-content-manager/services/ContentManager.js +++ b/packages/strapi-plugin-content-manager/services/ContentManager.js @@ -118,6 +118,11 @@ module.exports = { const files = values.files; + // set empty attributes if old values was cleared + _.difference(Object.keys(files), Object.keys(values.fields)).forEach(attr => { + values.fields[attr] = []; + }); + // Parse stringify JSON data. values = Object.keys(values.fields).reduce((acc, current) => { acc[current] = parser(values.fields[current]); From fdddab4ca81d800f4da791397bf08ed7186622cb Mon Sep 17 00:00:00 2001 From: DmitryKlymenko Date: Sun, 9 Sep 2018 12:43:19 +0300 Subject: [PATCH 3/3] Update ru.json --- .../admin/src/translations/ru.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/strapi-plugin-content-manager/admin/src/translations/ru.json b/packages/strapi-plugin-content-manager/admin/src/translations/ru.json index a4c43eb356..5866499e52 100644 --- a/packages/strapi-plugin-content-manager/admin/src/translations/ru.json +++ b/packages/strapi-plugin-content-manager/admin/src/translations/ru.json @@ -9,7 +9,7 @@ "containers.Edit.delete": "Удалить", "containers.Edit.reset": "Сбросить", "containers.Edit.returnList": "Вернуться к списку", - "containers.List.addAnEntry": "Добавить новую {entity}", + "containers.List.addAnEntry": "Добавить новые {entity}", "containers.List.pluginHeaderDescription": "{label} записей найдено", "containers.List.pluginHeaderDescription.singular": "{label} запись найдена", "components.LimitSelect.itemsPerPage": "Элементов на странице", @@ -46,9 +46,9 @@ "components.TableDelete.entries.plural": "{число} записей выбрано", "components.TableDelete.entries.singular": "{число} записей выделено", "components.TableDelete.delete": "Удалить все", - "components.TableEmpty.withFilters": "Нет {Тип данных} с примененными фильтрами...", - "components.TableEmpty.withoutFilter": "Нет {Тип данных}...", - "components.TableEmpty.withSearch": "Нет {Тип данных} согласно поиску ({поиск})", + "components.TableEmpty.withFilters": "Нет {contentType} с примененными фильтрами...", + "components.TableEmpty.withoutFilter": "Нет {contentType}...", + "components.TableEmpty.withSearch": "Нет {contentType} согласно поиску ({search})", "error.validation.json": "Это не JSON", "form.Input.label.inputDescription": "Это знчение переопределит метку, в заголовке таблицы", "form.Input.label": "Метка", @@ -107,4 +107,4 @@ "popUpWarning.title": "Пожалуйста подтвердите", "popUpWarning.bodyMessage.contentType.delete": "Вы уверены, что хотите удалить эту запись?" } - \ No newline at end of file +