From 4d5d8ac1436cc38dfcfd24e9ce1c3c93fd64b18f Mon Sep 17 00:00:00 2001
From: Daniel Pan <freeplant@gmail.com>
Date: Mon, 10 Feb 2020 09:25:17 +0800
Subject: [PATCH] Revert "add type & lang to custom nav (#4347)" (#4431)

This reverts commit d137c49184602637c247015605d325e0632e4085.
---
 frontend/src/components/main-side-nav.js | 39 ++++++------------------
 seahub/settings.py                       | 19 ++----------
 2 files changed, 13 insertions(+), 45 deletions(-)

diff --git a/frontend/src/components/main-side-nav.js b/frontend/src/components/main-side-nav.js
index 46af44041d..8727b25be7 100644
--- a/frontend/src/components/main-side-nav.js
+++ b/frontend/src/components/main-side-nav.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Link } from '@reach/router';
 import { Badge } from 'reactstrap';
-import { gettext, siteRoot, canPublishRepo, canAddRepo, canGenerateShareLink, canGenerateUploadLink, canInvitePeople, dtableWebServer, lang } from '../utils/constants';
+import { gettext, siteRoot, canPublishRepo, canAddRepo, canGenerateShareLink, canGenerateUploadLink, canInvitePeople, dtableWebServer } from '../utils/constants';
 import { seafileAPI } from '../utils/seafile-api';
 import { Utils } from '../utils/utils';
 import toaster from './toast';
@@ -167,33 +167,14 @@ class MainSideNav extends React.Component {
   renderCustomNavItems() {
     return (
       customNavItems.map((item, idx) => {
-        // if no item.lang, show
-        // if has item.lang && system.lang in item.lang, show
-        // other case hide
-        if (item.hasOwnProperty('lang') && item.lang.indexOf(lang) == -1) return null;
-        if (item.type === 'heading') {
-          return (
-            <h3 key={idx} className="sf-heading">{item.desc}</h3>
-          );
-        } else {
-          return (
-            <ul className="nav nav-pills flex-column nav-container">
-              {
-                item.map((nav, idx) => {
-                  if (nav.hasOwnProperty('lang') && nav.lang.indexOf(lang) == -1) return null;
-                  return (
-                    <li key={idx} className="nav-item">
-                      <a href={nav.link} className="nav-link ellipsis" title={nav.desc}>
-                        <span className={nav.icon} aria-hidden="true"></span>
-                        <span className="nav-text">{nav.desc}</span>
-                      </a>
-                    </li>
-                  );
-                })
-              }
-            </ul>
-          );
-        }
+        return (
+          <li key={idx} className="nav-item">
+            <a href={item.link} className="nav-link ellipsis" title={item.desc}>
+              <span className={item.icon} aria-hidden="true"></span>
+              <span className="nav-text">{item.desc}</span>
+            </a>
+          </li>
+        );
       })
     );
   }
@@ -295,8 +276,8 @@ class MainSideNav extends React.Component {
               </a>
               {this.renderSharedAdmin()}
             </li>
+            {customNavItems && this.renderCustomNavItems()}
           </ul>
-          {customNavItems && this.renderCustomNavItems()}
         </div>
 
         {dtableWebServer &&
diff --git a/seahub/settings.py b/seahub/settings.py
index d01a1a31f7..b785ce21d3 100644
--- a/seahub/settings.py
+++ b/seahub/settings.py
@@ -858,23 +858,10 @@ if ENABLE_OAUTH or ENABLE_WORK_WEIXIN:
 #####################
 # Custom Nav Items  #
 #####################
-# if lang is given and system's lang code not in lang, item will hide
 # an example:
-#
 # CUSTOM_NAV_ITEMS = [
-#     {'type': 'heading',
-#      'desc': 'my_custom_navs',
-#      'lang': ['en', 'zh-cn', 'de'],
+#     {'icon': 'sf2-icon-star',
+#      'desc': 'test custom name',
+#      'link': 'http://127.0.0.1:8000/shared-libs/',
 #      },
-#     [
-#      {'icon': 'sf2-icon-star',
-#       'desc': 'only show in english, chinese or german',
-#       'link': 'http://127.0.0.1:8000/shared-libs/',
-#       'lang': ['en', 'zh-cn', 'de'],
-#       },
-#      {'icon': 'sf2-icon-star',
-#       'desc': 'show in all languages',
-#       'link': 'http://127.0.0.1:8000/shared-libs/',
-#       },
-#     ],
 # ]