yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-26 08:52:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-file-reload

Browse Source
This commit is contained in:
Jim LAURIE 2018-09-10 15:12:52 +02:00 committed by GitHub
commit c68fdb1120
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/3.x.x/en/guides/deployment.md
View File

@ -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)

8
packages/strapi-plugin-content-manager/admin/src/translations/ru.json
View File

@ -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": "Метка",

5
packages/strapi-plugin-content-manager/services/ContentManager.js
View File

@ -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]);