From bc8508682825e91b657079fc6662e73ff3cb51fc Mon Sep 17 00:00:00 2001
From: Renaud Le Gac <legac@cppm.in2p3.fr>
Date: Fri, 22 Nov 2013 15:02:42 +0100
Subject: [PATCH] ExtJS 4.2: Migrate the pViewporLogin plugin.
---
models/widgets_viewport.py | 4 ++--
static/plugin_dbui/src/pviewportlogin.js | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/models/widgets_viewport.py b/models/widgets_viewport.py
index 0f999432..4fbcdd49 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 b82f2e2d..93ce8617 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,
--
GitLab