Browse Source

Merge pull request #551 in BA/design from ~PLOUGH/design:master to master

* commit 'e76d3c8a75a66a52a12c43a944512a8153529cda':
  REPORT-881 远程设计,非管理员连接,不应该看到菜单栏的“服务器”选项
master
superman 8 years ago
parent
commit
0a82cbe1c6
  1. 9
      designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

9
designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

@ -133,7 +133,9 @@ public abstract class ToolBarMenuDock {
menuList.addAll(Arrays.asList(menuDefs)); menuList.addAll(Arrays.asList(menuDefs));
// 添加服务器菜单 // 添加服务器菜单
menuList.add(createServerMenuDef(plus)); if (FRContext.getCurrentEnv() != null && FRContext.getCurrentEnv().isRoot()) {
menuList.add(createServerMenuDef(plus));
}
// 添加帮助菜单 // 添加帮助菜单
menuList.add(createHelpMenuDef()); menuList.add(createHelpMenuDef());
@ -268,11 +270,6 @@ public abstract class ToolBarMenuDock {
protected MenuDef createServerMenuDef(ToolBarMenuDockPlus plus) { protected MenuDef createServerMenuDef(ToolBarMenuDockPlus plus) {
MenuDef menuDef = new MenuDef(Inter.getLocText("FR-Designer_M-Server"), 'S'); 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()) { if (!BaseUtils.isAuthorityEditing()) {
menuDef.addShortCut( menuDef.addShortCut(
new ConnectionListAction(), new ConnectionListAction(),

Loading…
Cancel
Save