diff --git a/frontend/src/components/main-side-nav-folded.js b/frontend/src/components/main-side-nav-folded.js index 7f6a7d1a09..fe5f6771de 100644 --- a/frontend/src/components/main-side-nav-folded.js +++ b/frontend/src/components/main-side-nav-folded.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Link } from '@gatsbyjs/reach-router'; -import { gettext, siteRoot, canInvitePeople, enableTC, sideNavFooterCustomHtml, additionalAppBottomLinks, +import { gettext, siteRoot, canInvitePeople, enableTC, sideNavFooterCustomHtml, isDocs, isPro, isDBSqlite3, customNavItems, mediaUrl, curNoteMsg } from '../utils/constants'; import { SIDE_PANEL_FOLDED_WIDTH, SUB_NAV_ITEM_HEIGHT } from '../constants'; import Tip from './side-nav-icon-tip'; @@ -215,17 +215,6 @@ class MainSideNavFolded extends React.Component { } - {additionalAppBottomLinks && ( - <> - {Object.keys(additionalAppBottomLinks).map((key, index) => { - return ( - - - - ); - })} - - )}
  • diff --git a/frontend/src/components/main-side-nav.js b/frontend/src/components/main-side-nav.js index 92f6022ebf..87503d4b31 100644 --- a/frontend/src/components/main-side-nav.js +++ b/frontend/src/components/main-side-nav.js @@ -4,7 +4,7 @@ import { Link } from '@gatsbyjs/reach-router'; import { gettext, siteRoot, canAddGroup, canAddRepo, canShareRepo, canGenerateShareLink, canGenerateUploadLink, canInvitePeople, - enableTC, sideNavFooterCustomHtml, additionalAppBottomLinks, + enableTC, sideNavFooterCustomHtml, canViewOrg, isDocs, isPro, isDBSqlite3, customNavItems, mediaUrl } from '../utils/constants'; import { seafileAPI } from '../utils/seafile-api'; @@ -282,18 +282,6 @@ class MainSideNav extends React.Component {
  • } - {additionalAppBottomLinks && ( - <> - {Object.keys(additionalAppBottomLinks).map((key, index) => { - return ( - - - {key} - - ); - })} - - )}
  • diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js index 6fdb9aad5f..c33a906e87 100644 --- a/frontend/src/utils/constants.js +++ b/frontend/src/utils/constants.js @@ -107,7 +107,6 @@ export const enableFileTags = window.app.pageOptions.enableFileTags || false; export const workspaceID = window.app.pageOptions.workspaceID; export const showLogoutIcon = window.app.pageOptions.showLogoutIcon; export const additionalShareDialogNote = window.app.pageOptions.additionalShareDialogNote; -export const additionalAppBottomLinks = window.app.pageOptions.additionalAppBottomLinks; export const additionalAboutDialogLinks = window.app.pageOptions.additionalAboutDialogLinks; // map settings diff --git a/seahub/settings.py b/seahub/settings.py index 19e8016852..33de611b90 100644 --- a/seahub/settings.py +++ b/seahub/settings.py @@ -865,12 +865,6 @@ ENABLE_REPO_WIKI_MODE = True # } ADDITIONAL_SHARE_DIALOG_NOTE = None -# ADDITIONAL_APP_BOTTOM_LINKS = { -# 'seafile': 'http://dev.seahub.com/seahub', -# 'dtable-web': 'http://dev.seahub.com/dtable-web' -# } -ADDITIONAL_APP_BOTTOM_LINKS = None - # ADDITIONAL_ABOUT_DIALOG_LINKS = { # 'seafile': 'http://dev.seahub.com/seahub', # 'dtable-web': 'http://dev.seahub.com/dtable-web' diff --git a/seahub/templates/base_for_react.html b/seahub/templates/base_for_react.html index 97daea4bdc..73b462f5ce 100644 --- a/seahub/templates/base_for_react.html +++ b/seahub/templates/base_for_react.html @@ -149,7 +149,6 @@ enablePDFThumbnail: {% if enable_pdf_thumbnail %} true {% else %} false {% endif %}, showLogoutIcon: {% if show_logout_icon %} true {% else %} false {% endif %}, additionalShareDialogNote: {% if additional_share_dialog_note %} {{ additional_share_dialog_note|safe }} {% else %} null {% endif %}, - additionalAppBottomLinks: {% if additional_app_bottom_links %} {{ additional_app_bottom_links|safe }} {% else %} null {% endif %}, additionalAboutDialogLinks: {% if additional_about_dialog_links %} {{ additional_about_dialog_links|safe }} {% else %} null {% endif %}, enableOnlyoffice: {% if enableOnlyoffice %} true {% else %} false {% endif %}, onlyofficeConverterExtensions: {% if onlyofficeConverterExtensions %} {{onlyofficeConverterExtensions|safe}} {% else %} null {% endif %}, diff --git a/seahub/views/__init__.py b/seahub/views/__init__.py index 73f1755337..d242a09f3d 100644 --- a/seahub/views/__init__.py +++ b/seahub/views/__init__.py @@ -57,7 +57,7 @@ from seahub.settings import AVATAR_FILE_STORAGE, ENABLE_REPO_SNAPSHOT_LABEL, \ SHARE_LINK_EXPIRE_DAYS_MAX, SHARE_LINK_EXPIRE_DAYS_DEFAULT, \ UPLOAD_LINK_EXPIRE_DAYS_MIN, UPLOAD_LINK_EXPIRE_DAYS_MAX, UPLOAD_LINK_EXPIRE_DAYS_DEFAULT, \ SEAFILE_COLLAB_SERVER, ENABLE_RESET_ENCRYPTED_REPO_PASSWORD, \ - ADDITIONAL_SHARE_DIALOG_NOTE, ADDITIONAL_APP_BOTTOM_LINKS, ADDITIONAL_ABOUT_DIALOG_LINKS, \ + ADDITIONAL_SHARE_DIALOG_NOTE, ADDITIONAL_ABOUT_DIALOG_LINKS, \ DTABLE_WEB_SERVER, SEADOC_SERVER_URL from seahub.ocm.settings import ENABLE_OCM, OCM_REMOTE_SERVERS @@ -1136,7 +1136,6 @@ def react_fake_view(request, **kwargs): 'enable_show_contact_email_when_search_user': settings.ENABLE_SHOW_CONTACT_EMAIL_WHEN_SEARCH_USER, 'enable_show_login_id_when_search_user': settings.ENABLE_SHOW_LOGIN_ID_WHEN_SEARCH_USER, 'additional_share_dialog_note': ADDITIONAL_SHARE_DIALOG_NOTE, - 'additional_app_bottom_links': ADDITIONAL_APP_BOTTOM_LINKS, 'additional_about_dialog_links': ADDITIONAL_ABOUT_DIALOG_LINKS, 'enable_ocm_via_webdav': ENABLE_OCM_VIA_WEBDAV, 'enable_ocm': ENABLE_OCM,