diff --git a/frontend/src/components/dialog/import-members-dialog.js b/frontend/src/components/dialog/import-members-dialog.js index 9700611ef4..512ebcddc6 100644 --- a/frontend/src/components/dialog/import-members-dialog.js +++ b/frontend/src/components/dialog/import-members-dialog.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Alert, Modal, ModalHeader, ModalBody, ModalFooter, Button } from 'reactstrap'; -import { gettext, siteRoot } from '../../utils/constants'; +import { gettext, siteRoot, groupImportMembersExtraMsg } from '../../utils/constants'; const propTypes = { toggleImportMembersDialog: PropTypes.func.isRequired, @@ -50,6 +50,7 @@ class ImportMembersDialog extends React.Component { {gettext('Import members from a .xlsx file')} +

{groupImportMembersExtraMsg}

{gettext('Download an example file')}

diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js index cc0c08999f..dc260a936e 100644 --- a/frontend/src/utils/constants.js +++ b/frontend/src/utils/constants.js @@ -30,6 +30,7 @@ export const contactEmail = window.app.pageOptions.contactEmail; export const username = window.app.pageOptions.username; export const canAddRepo = window.app.pageOptions.canAddRepo; export const canAddGroup = window.app.pageOptions.canAddGroup; +export const groupImportMembersExtraMsg = window.app.pageOptions.groupImportMembersExtraMsg; export const canGenerateShareLink = window.app.pageOptions.canGenerateShareLink; export const canGenerateUploadLink = window.app.pageOptions.canGenerateUploadLink; export const canSendShareLinkEmail = window.app.pageOptions.canSendShareLinkEmail; diff --git a/seahub/group/settings.py b/seahub/group/settings.py index eee1891553..b59bcda484 100644 --- a/seahub/group/settings.py +++ b/seahub/group/settings.py @@ -2,3 +2,4 @@ from django.conf import settings GROUP_MEMBERS_DEFAULT_DISPLAY = getattr(settings, 'GROUP_MEMBERS_DEFAULT_DISPLAY', 10) +GROUP_IMPORT_MEMBERS_EXTRA_MSG = getattr(settings, 'GROUP_IMPORT_MEMBERS_EXTRA_MSG', '') diff --git a/seahub/templates/base_for_react.html b/seahub/templates/base_for_react.html index 23871dcdfa..80490f7985 100644 --- a/seahub/templates/base_for_react.html +++ b/seahub/templates/base_for_react.html @@ -60,6 +60,7 @@ trashReposExpireDays: {% if trash_repos_expire_days >= 0 %} {{ trash_repos_expire_days }} {% else %} null {% endif %}, canAddRepo: {% if user.permissions.can_add_repo %} true {% else %} false {% endif %}, canAddGroup: {% if user.permissions.can_add_group %} true {% else %} false {% endif %}, + groupImportMembersExtraMsg: "{{group_import_members_extra_msg}}", canGenerateShareLink: {% if user.permissions.can_generate_share_link %} true {% else %} false {% endif %}, canGenerateUploadLink: {% if user.permissions.can_generate_upload_link %} true {% else %} false {% endif %}, canSendShareLinkEmail: {% if user.permissions.can_send_share_link_mail %} true {% else %} false {% endif %}, diff --git a/seahub/views/__init__.py b/seahub/views/__init__.py index 06d9e30f84..b4c82afc56 100644 --- a/seahub/views/__init__.py +++ b/seahub/views/__init__.py @@ -63,6 +63,7 @@ from seahub.wopi.settings import ENABLE_OFFICE_WEB_APP from seahub.onlyoffice.settings import ONLYOFFICE_DESKTOP_EDITORS_PORTAL_LOGIN from seahub.ocm.settings import ENABLE_OCM, OCM_REMOTE_SERVERS from seahub.constants import HASH_URLS, PERMISSION_READ +from seahub.group.settings import GROUP_IMPORT_MEMBERS_EXTRA_MSG from seahub.weixin.settings import ENABLE_WEIXIN @@ -1213,4 +1214,5 @@ def react_fake_view(request, **kwargs): 'enable_ocm': ENABLE_OCM, 'ocm_remote_servers': OCM_REMOTE_SERVERS, 'enable_share_to_department': settings.ENABLE_SHARE_TO_DEPARTMENT, + 'group_import_members_extra_msg': GROUP_IMPORT_MEMBERS_EXTRA_MSG, })