diff --git a/models/widgets_viewport.py b/models/widgets_viewport.py index 0f99943286a5f390500d0c3eb644f27150fa227c..4fbcdd49fa2af386a5a4b3359b16e2b8a32e7ca5 100644 --- a/models/widgets_viewport.py +++ b/models/widgets_viewport.py @@ -58,8 +58,8 @@ reportNode.add_child(T('report_3'), leaf_3) # The viewport with its navigation tree # viewportModifier = dbui.ViewportModifier() -# viewportModifier.append_plugins('pViewportLogin') -# viewportModifier.configure(logged=True) +viewportModifier.append_plugins('pViewportLogin') +viewportModifier.configure(logged=True); viewportModifier.add_node(helpNode, casNode, formNode, gridNode, reportNode) # viewportModifier.default_node(T('Tables'), T('publications')) diff --git a/static/plugin_dbui/src/pviewportlogin.js b/static/plugin_dbui/src/pviewportlogin.js index b82f2e2dacac5cab1b6c8239f3ea99781819fda7..93ce861739cc06555ad6e77948b118c70f304ba8 100644 --- a/static/plugin_dbui/src/pviewportlogin.js +++ b/static/plugin_dbui/src/pviewportlogin.js @@ -40,7 +40,7 @@ Ext.define('App.ViewportLogin', { tbar.add('->', '-'); - tbar.addButton({ + tbar.add({ hidden: inhibit_login, href: "admin", handler: this.openURL, @@ -48,7 +48,7 @@ Ext.define('App.ViewportLogin', { tooltip: this.textLogin }); - tbar.addButton({ + tbar.add({ hidden: inhibit_logout, href: "default/user/change_password", handler: this.openURL, @@ -57,10 +57,10 @@ Ext.define('App.ViewportLogin', { }); if (inhibit_login) { - tbar.addSeparator(); + tbar.add('-'); } - tbar.addButton({ + tbar.add({ hidden: inhibit_logout, href: "default/user/logout", handler: this.openURL,