From 2686f1f4661893c3ce75f8243d25e2aa22d4f7e9 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Fri, 25 Nov 2016 10:26:59 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-881=20=E8=BF=9C=E7=A8=8B=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=EF=BC=8C=E9=9D=9E=E7=AE=A1=E7=90=86=E5=91=98=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=EF=BC=8C=E4=B8=8D=E5=BA=94=E8=AF=A5=E7=9C=8B=E5=88=B0?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=A0=8F=E7=9A=84=E2=80=9C=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8=E2=80=9D=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/mainframe/toolbar/ToolBarMenuDock.java | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
index 8df23d70d9..3e862cf288 100644
--- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
+++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
@@ -133,7 +133,9 @@ public abstract class ToolBarMenuDock {
         menuList.addAll(Arrays.asList(menuDefs));
 
         // 添加服务器菜单
-        menuList.add(createServerMenuDef(plus));
+        if (FRContext.getCurrentEnv() != null && FRContext.getCurrentEnv().isRoot()) {
+            menuList.add(createServerMenuDef(plus));
+        }
 
         // 添加帮助菜单
         menuList.add(createHelpMenuDef());
@@ -245,11 +247,6 @@ public abstract class ToolBarMenuDock {
     protected MenuDef createServerMenuDef(ToolBarMenuDockPlus plus) {
         MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_M-Server"), 'S');
 
-        if (FRContext.getCurrentEnv() == null || !FRContext.getCurrentEnv().isRoot()) {
-            menuDef.addShortCut(new ConnectionListAction());
-            return menuDef;
-        }
-
         if (!BaseUtils.isAuthorityEditing()) {
             menuDef.addShortCut(
                     new ConnectionListAction(),