mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
Merge branch 'feature-2.4/RM-4997' into merge-2.5/Merge_RM-4997
Conflicts: rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/dod5015/messages/dod5015-model_fr.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_de.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_es.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_fr.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_it.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_ja.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_nb.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_nl.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_pt_BR.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_ru.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/action-service_zh_CN.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/actions_fr.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_de.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_es.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_fr.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_it.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_ja.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_nb.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_nl.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_pt_BR.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_ru.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/admin-service_zh_CN.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_de.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_es.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_fr.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_it.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_ja.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_nb.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_nl.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_pt_BR.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_ru.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/audit-service_zh_CN.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/capability-service_fr.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/dataset-service_de.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/dataset-service_ja.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/notification-service_ja.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service_de.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service_fr.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-management-service_ja.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_fr.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/records-model_ja.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/report-model_es.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/report-model_it.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/report-model_ja.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/report-model_nl.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/report-model_ru.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/rm-actions_fr.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/rm-system_de.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/rm-system_ja.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/template_fr.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/template_it.properties rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/messages/template_ru.properties rm-community/rm-community-repo/config/alfresco/workflow/rm-workflow-messages_ja.properties rm-community/rm-community-share/config/alfresco/messages/rm_de.properties rm-community/rm-community-share/config/alfresco/messages/rm_es.properties rm-community/rm-community-share/config/alfresco/messages/rm_fr.properties rm-community/rm-community-share/config/alfresco/messages/rm_ja.properties rm-community/rm-community-share/config/alfresco/messages/rm_nb.properties rm-community/rm-community-share/config/alfresco/messages/rm_nl.properties rm-community/rm-community-share/config/alfresco/messages/rm_pt_BR.properties rm-community/rm-community-share/config/alfresco/messages/rm_ru.properties rm-community/rm-community-share/config/alfresco/messages/rm_zh_CN.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/config/components/fileplan/events.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get_de.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get_es.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get_it.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get_ja.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get_nb.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get_nl.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get_pt_BR.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get_ru.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/audit/audit.get_zh_CN.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-audit.get_de.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-audit.get_es.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-audit.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-audit.get_it.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-audit.get_ja.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-audit.get_nb.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-audit.get_nl.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-audit.get_pt_BR.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-audit.get_ru.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-audit.get_zh_CN.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-custom-metadata.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-define-roles.get_de.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-define-roles.get_es.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-define-roles.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-define-roles.get_it.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-define-roles.get_ja.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-define-roles.get_nb.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-define-roles.get_nl.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-define-roles.get_pt_BR.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-define-roles.get_ru.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-define-roles.get_zh_CN.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-email-mappings.get_de.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-email-mappings.get_es.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-email-mappings.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-email-mappings.get_it.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-email-mappings.get_ja.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-email-mappings.get_nb.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-email-mappings.get_nl.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-email-mappings.get_pt_BR.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-email-mappings.get_ru.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-email-mappings.get_zh_CN.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-events.get_de.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-events.get_es.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-events.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-events.get_it.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-events.get_ja.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-events.get_nb.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-events.get_nl.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-events.get_pt_BR.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-events.get_ru.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-events.get_zh_CN.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-references.get_es.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-references.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/console/rm-users-and-groups.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/dashlets/datasets.get_de.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/dashlets/datasets.get_es.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/dashlets/datasets.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/dashlets/datasets.get_it.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/dashlets/datasets.get_ja.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/dashlets/datasets.get_nb.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/dashlets/datasets.get_nl.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/dashlets/datasets.get_pt_BR.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/dashlets/datasets.get_ru.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/dashlets/datasets.get_zh_CN.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/document-details/document-actions.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/documentlist-v2.get_de.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/documentlist-v2.get_es.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/documentlist-v2.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/documentlist-v2.get_it.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/documentlist-v2.get_ja.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/documentlist-v2.get_nb.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/documentlist-v2.get_nl.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/documentlist-v2.get_pt_BR.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/documentlist-v2.get_ru.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/documentlist-v2.get_zh_CN.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/fileplan.get_ru.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/savedsearch.get_de.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/documentlibrary/savedsearch.get_ja.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/edit-metadata/edit-metadata-mgr.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/fileplan/disposition-edit.get_de.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/fileplan/disposition-edit.get_es.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/fileplan/disposition-edit.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/fileplan/disposition-edit.get_it.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/fileplan/disposition-edit.get_ja.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/fileplan/disposition-edit.get_nb.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/fileplan/disposition-edit.get_nl.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/fileplan/disposition-edit.get_pt_BR.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/fileplan/disposition-edit.get_ru.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/fileplan/disposition-edit.get_zh_CN.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/fileplan/disposition.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/fileplan/report.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/references/new-reference.get_es.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/references/new-reference.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/references/new-reference.get_it.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/references/new-reference.get_ja.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/references/new-reference.get_nb.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/references/new-reference.get_nl.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/references/new-reference.get_pt_BR.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/references/new-reference.get_ru.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/references/new-reference.get_zh_CN.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/config/rule-config-action.get_de.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/config/rule-config-action.get_es.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/config/rule-config-action.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/config/rule-config-action.get_it.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/config/rule-config-action.get_ja.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/config/rule-config-action.get_nb.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/config/rule-config-action.get_nl.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/config/rule-config-action.get_pt_BR.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/config/rule-config-action.get_ru.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/config/rule-config-action.get_zh_CN.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-details.get_de.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-details.get_es.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-details.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-details.get_it.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-details.get_ja.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-details.get_nb.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-details.get_nl.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-details.get_pt_BR.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-details.get_ru.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-details.get_zh_CN.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-edit.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-edit.get_ja.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/rules/rule-edit.get_nl.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/search/search.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/upload/dnd-upload.get_it.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/upload/dnd-upload.get_ja.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/upload/dnd-upload.get_ru.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/upload/flash-upload.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/upload/flash-upload.get_pt_BR.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/components/upload/html-upload.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/customizations/components/node-details/node-header.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/copy-move-link-file-to.get_de.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/copy-move-link-file-to.get_es.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/copy-move-link-file-to.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/copy-move-link-file-to.get_it.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/copy-move-link-file-to.get_ja.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/copy-move-link-file-to.get_nb.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/copy-move-link-file-to.get_nl.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/copy-move-link-file-to.get_pt_BR.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/copy-move-link-file-to.get_ru.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/copy-move-link-file-to.get_zh_CN.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/file-report.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/file-report.get_ja.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/file-report.get_nb.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/file-report.get_nl.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/file-report.get_pt_BR.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/file-report.get_ru.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/hold/add-to-hold.get_es.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/hold/add-to-hold.get_fr.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/hold/add-to-hold.get_nb.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/hold/add-to-hold.get_nl.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/hold/add-to-hold.get_ru.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/hold/remove-from-hold.get_es.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/hold/remove-from-hold.get_ja.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/hold/remove-from-hold.get_nl.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/hold/remove-from-hold.get_ru.properties rm-community/rm-community-share/config/alfresco/site-webscripts/org/alfresco/rm/modules/documentlibrary/rejected-record-info.get_fr.properties rm-community/rm-community-share/source/web/js/alfresco/rm/services/i18n/RelationshipService_de.properties rm-community/rm-community-share/source/web/js/alfresco/rm/services/i18n/RelationshipService_es.properties rm-community/rm-community-share/source/web/js/alfresco/rm/services/i18n/RelationshipService_fr.properties rm-community/rm-community-share/source/web/js/alfresco/rm/services/i18n/RelationshipService_it.properties rm-community/rm-community-share/source/web/js/alfresco/rm/services/i18n/RelationshipService_ja.properties rm-community/rm-community-share/source/web/js/alfresco/rm/services/i18n/RelationshipService_nb.properties rm-community/rm-community-share/source/web/js/alfresco/rm/services/i18n/RelationshipService_nl.properties rm-community/rm-community-share/source/web/js/alfresco/rm/services/i18n/RelationshipService_pt_BR.properties rm-community/rm-community-share/source/web/js/alfresco/rm/services/i18n/RelationshipService_ru.properties rm-community/rm-community-share/source/web/js/alfresco/rm/services/i18n/RelationshipService_zh_CN.properties rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content-model_fr.properties rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_de.properties rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_es.properties rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_fr.properties rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_it.properties rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_ja.properties rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_nb.properties rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_nl.properties rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_pt_BR.properties rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_ru.properties rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/classified-content_zh_CN.properties rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/security-marks-model_de.properties rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/security-marks-model_es.properties rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/security-marks-model_fr.properties rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/security-marks-model_it.properties rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/security-marks-model_ja.properties rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/security-marks-model_nb.properties rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/security-marks-model_nl.properties rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/security-marks-model_pt_BR.properties rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/security-marks-model_ru.properties rm-enterprise/rm-enterprise-repo/src/main/amp/config/alfresco/module/alfresco-rm-enterprise-repo/messages/security-marks-model_zh_CN.properties rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-clearance.get_de.properties rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-clearance.get_es.properties rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-clearance.get_fr.properties rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-clearance.get_it.properties rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-clearance.get_ja.properties rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-clearance.get_nb.properties rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-clearance.get_nl.properties rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-clearance.get_pt_BR.properties rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-clearance.get_ru.properties rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/site-webscripts/org/alfresco/components/console/classification/security-clearance.get_zh_CN.properties rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/web-extension/messages/alfresco-rm-share-enterprise_de.properties rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/web-extension/messages/alfresco-rm-share-enterprise_es.properties rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/web-extension/messages/alfresco-rm-share-enterprise_fr.properties rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/web-extension/messages/alfresco-rm-share-enterprise_it.properties rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/web-extension/messages/alfresco-rm-share-enterprise_ja.properties rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/web-extension/messages/alfresco-rm-share-enterprise_nb.properties rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/web-extension/messages/alfresco-rm-share-enterprise_nl.properties rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/web-extension/messages/alfresco-rm-share-enterprise_pt_BR.properties rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/web-extension/messages/alfresco-rm-share-enterprise_ru.properties rm-enterprise/rm-enterprise-share/src/main/amp/config/alfresco/web-extension/messages/alfresco-rm-share-enterprise_zh_CN.properties rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/ClassifyService_de.properties rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/ClassifyService_es.properties rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/ClassifyService_fr.properties rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/ClassifyService_it.properties rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/ClassifyService_ja.properties rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/ClassifyService_nb.properties rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/ClassifyService_nl.properties rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/ClassifyService_pt_BR.properties rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/ClassifyService_ru.properties rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/ClassifyService_zh_CN.properties rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/UserSecurityClearanceService_de.properties rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/UserSecurityClearanceService_es.properties rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/UserSecurityClearanceService_fr.properties rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/UserSecurityClearanceService_it.properties rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/UserSecurityClearanceService_ja.properties rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/UserSecurityClearanceService_nb.properties rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/UserSecurityClearanceService_nl.properties rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/UserSecurityClearanceService_pt_BR.properties rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/UserSecurityClearanceService_ru.properties rm-enterprise/rm-enterprise-share/src/main/amp/web/js/alfresco/rm/services/i18n/UserSecurityClearanceService_zh_CN.properties
This commit is contained in:
Tuna Aksoy
@@ -27,6 +27,8 @@
|
||||
|
||||
package org.alfresco.module.org_alfresco_module_rm.model.rma.type;
|
||||
|
||||
import static org.alfresco.module.org_alfresco_module_rm.record.RecordUtils.appendIdentifierToName;
|
||||
|
||||
import org.alfresco.module.org_alfresco_module_rm.model.BaseBehaviourBean;
|
||||
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
|
||||
import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
|
||||
@@ -88,6 +90,7 @@ public class NonElectronicRecordType extends BaseBehaviourBean implements NodeSe
|
||||
if (!nodeService.hasAspect(child, ASPECT_RECORD))
|
||||
{
|
||||
recordService.makeRecord(child);
|
||||
appendIdentifierToName(nodeService, child);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,6 +27,8 @@
|
||||
|
||||
package org.alfresco.module.org_alfresco_module_rm.model.rma.type;
|
||||
|
||||
import static org.alfresco.module.org_alfresco_module_rm.record.RecordUtils.appendIdentifierToName;
|
||||
|
||||
import org.alfresco.error.AlfrescoRuntimeException;
|
||||
import org.alfresco.model.ContentModel;
|
||||
import org.alfresco.module.org_alfresco_module_rm.identifier.IdentifierService;
|
||||
@@ -198,6 +200,7 @@ public class RecordsManagementContainerType extends BaseBehaviourBean
|
||||
if (!nodeService.hasAspect(child, ASPECT_RECORD))
|
||||
{
|
||||
recordService.makeRecord(child);
|
||||
appendIdentifierToName(nodeService, child);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,10 +27,10 @@
|
||||
|
||||
package org.alfresco.module.org_alfresco_module_rm.record;
|
||||
|
||||
import static org.alfresco.module.org_alfresco_module_rm.record.RecordUtils.appendIdentifierToName;
|
||||
import static org.alfresco.repo.policy.Behaviour.NotificationFrequency.FIRST_EVENT;
|
||||
import static org.alfresco.repo.policy.Behaviour.NotificationFrequency.TRANSACTION_COMMIT;
|
||||
import static org.alfresco.repo.policy.annotation.BehaviourKind.ASSOCIATION;
|
||||
import static org.apache.commons.lang.StringUtils.isNotBlank;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.ArrayList;
|
||||
@@ -422,7 +422,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
|
||||
ContentData contentData = (ContentData) nodeService.getProperty(nodeRef, ContentModel.PROP_CONTENT);
|
||||
if (ContentData.hasContent(contentData) && contentData.getSize() > 0)
|
||||
{
|
||||
renameRecord(nodeRef);
|
||||
appendIdentifierToName(nodeService, nodeRef);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -831,7 +831,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
|
||||
|
||||
// make the document a record
|
||||
makeRecord(nodeRef);
|
||||
renameRecord(nodeRef);
|
||||
appendIdentifierToName(nodeService, nodeRef);
|
||||
|
||||
if (latestVersionRecord != null)
|
||||
{
|
||||
@@ -927,7 +927,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
|
||||
|
||||
// make record
|
||||
makeRecord(record);
|
||||
renameRecord(record);
|
||||
appendIdentifierToName(nodeService, record);
|
||||
|
||||
// remove added copy assocs
|
||||
List<AssociationRef> recordAssocs = nodeService.getTargetAssocs(record, ContentModel.ASSOC_ORIGINAL);
|
||||
@@ -1062,7 +1062,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
|
||||
{
|
||||
// make record
|
||||
makeRecord(record);
|
||||
renameRecord(record);
|
||||
appendIdentifierToName(nodeService, record);
|
||||
}
|
||||
|
||||
return record;
|
||||
@@ -1113,7 +1113,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
|
||||
|
||||
if (TYPE_NON_ELECTRONIC_DOCUMENT.equals(nodeService.getType(document)))
|
||||
{
|
||||
renameRecord(document);
|
||||
appendIdentifierToName(nodeService, document);
|
||||
}
|
||||
}
|
||||
finally
|
||||
@@ -1714,42 +1714,7 @@ public class RecordServiceImpl extends BaseBehaviourBean
|
||||
{
|
||||
if (!nodeService.hasAspect(nodeRef, ContentModel.ASPECT_HIDDEN) && !nodeService.hasAspect(nodeRef, ContentModel.ASPECT_LOCKABLE))
|
||||
{
|
||||
renameRecord(nodeRef);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Appends the record identifier to the name of the record
|
||||
*
|
||||
* @param nodeRef The node reference of the record.
|
||||
*/
|
||||
private void renameRecord(NodeRef nodeRef)
|
||||
{
|
||||
// get the record id
|
||||
String recordId = (String) nodeService.getProperty(nodeRef, PROP_IDENTIFIER);
|
||||
|
||||
if (isNotBlank(recordId))
|
||||
{
|
||||
// get the record name
|
||||
String name = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
|
||||
|
||||
// rename the record
|
||||
int dotIndex = name.lastIndexOf('.');
|
||||
String prefix = name;
|
||||
String postfix = "";
|
||||
if (dotIndex > 0)
|
||||
{
|
||||
prefix = name.substring(0, dotIndex);
|
||||
postfix = name.substring(dotIndex);
|
||||
}
|
||||
String recordName = prefix + " (" + recordId + ")" + postfix;
|
||||
|
||||
nodeService.setProperty(nodeRef, ContentModel.PROP_NAME, recordName);
|
||||
|
||||
if (logger.isDebugEnabled())
|
||||
{
|
||||
logger.debug("Rename " + name + " to " + recordName);
|
||||
}
|
||||
appendIdentifierToName(nodeService, nodeRef);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
/*
|
||||
* #%L
|
||||
* Alfresco Records Management Module
|
||||
* %%
|
||||
* Copyright (C) 2005 - 2017 Alfresco Software Limited
|
||||
* %%
|
||||
* This file is part of the Alfresco software.
|
||||
* -
|
||||
* If the software was purchased under a paid Alfresco license, the terms of
|
||||
* the paid license agreement will prevail. Otherwise, the software is
|
||||
* provided under the following open source license terms:
|
||||
* -
|
||||
* Alfresco is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
* -
|
||||
* Alfresco is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
* -
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
||||
* #L%
|
||||
*/
|
||||
package org.alfresco.module.org_alfresco_module_rm.record;
|
||||
|
||||
import static org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel.PROP_IDENTIFIER;
|
||||
import static org.alfresco.util.ParameterCheck.mandatory;
|
||||
import static org.apache.commons.lang.StringUtils.isNotBlank;
|
||||
|
||||
import org.alfresco.model.ContentModel;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.cmr.repository.NodeService;
|
||||
|
||||
/**
|
||||
* Util class for records
|
||||
*
|
||||
* @author Tuna Aksoy
|
||||
* @since 2.4
|
||||
*/
|
||||
public class RecordUtils
|
||||
{
|
||||
private RecordUtils()
|
||||
{
|
||||
// Will not be called
|
||||
}
|
||||
|
||||
/**
|
||||
* Appends the record identifier to the name of the record
|
||||
*
|
||||
* @param nodeRef The node reference of the record.
|
||||
*/
|
||||
public static void appendIdentifierToName(NodeService nodeService, NodeRef nodeRef)
|
||||
{
|
||||
mandatory("nodeService", nodeService);
|
||||
mandatory("nodeRef", nodeRef);
|
||||
|
||||
// get the record id
|
||||
String recordId = (String) nodeService.getProperty(nodeRef, PROP_IDENTIFIER);
|
||||
|
||||
if (isNotBlank(recordId))
|
||||
{
|
||||
// get the record name
|
||||
String name = (String) nodeService.getProperty(nodeRef, ContentModel.PROP_NAME);
|
||||
|
||||
// rename the record
|
||||
int dotIndex = name.lastIndexOf('.');
|
||||
String prefix = name;
|
||||
String postfix = "";
|
||||
if (dotIndex > 0)
|
||||
{
|
||||
prefix = name.substring(0, dotIndex);
|
||||
postfix = name.substring(dotIndex);
|
||||
}
|
||||
String recordName = prefix + " (" + recordId + ")" + postfix;
|
||||
|
||||
nodeService.setProperty(nodeRef, ContentModel.PROP_NAME, recordName);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user