From 8e7e4f56e39fefdc9a5d29e5b6d080bf005a315d Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Tue, 8 Nov 2011 08:09:38 +0100 Subject: [PATCH] new LogView class - implement openvz initlog viewer --- www/manager/Makefile | 2 +- www/manager/{node/Syslog.js => grid/LogView.js} | 11 +++++------ www/manager/node/Config.js | 3 ++- www/manager/openvz/Config.js | 6 ++++++ 4 files changed, 14 insertions(+), 8 deletions(-) rename www/manager/{node/Syslog.js => grid/LogView.js} (76%) diff --git a/www/manager/Makefile b/www/manager/Makefile index 22f40d07..eda66fa1 100644 --- a/www/manager/Makefile +++ b/www/manager/Makefile @@ -60,6 +60,7 @@ JSSRC= \ tree/ResourceTree.js \ panel/ConfigPanel.js \ grid/BackupView.js \ + grid/LogView.js \ node/DNSEdit.js \ node/DNSView.js \ node/TimeView.js \ @@ -70,7 +71,6 @@ JSSRC= \ node/ServiceView.js \ node/NetworkEdit.js \ node/NetworkView.js \ - node/Syslog.js \ node/Tasks.js \ node/Config.js \ qemu/StatusView.js \ diff --git a/www/manager/node/Syslog.js b/www/manager/grid/LogView.js similarity index 76% rename from www/manager/node/Syslog.js rename to www/manager/grid/LogView.js index 5bb71d55..b80de5aa 100644 --- a/www/manager/node/Syslog.js +++ b/www/manager/grid/LogView.js @@ -1,14 +1,13 @@ -Ext.define('PVE.node.Syslog', { +Ext.define('PVE.grig.LogView', { extend: 'Ext.grid.GridPanel', - alias: ['widget.pveNodeSyslog'], + alias: ['widget.pveLogView'], initComponent : function() { var me = this; - var nodename = me.pveSelNode.data.node; - if (!nodename) { - throw "no node name specified"; + if (!me.url) { + throw "no url specified"; } var store = Ext.create('Ext.data.Store', { @@ -19,7 +18,7 @@ Ext.define('PVE.node.Syslog', { type: 'pve', startParam: 'start', limitParam: 'limit', - url: "/api2/json/nodes/" + nodename + "/syslog" + url: me.url } }); diff --git a/www/manager/node/Config.js b/www/manager/node/Config.js index 37514feb..b84ed5b3 100644 --- a/www/manager/node/Config.js +++ b/www/manager/node/Config.js @@ -42,7 +42,8 @@ Ext.define('PVE.node.Config', { { title: 'Syslog', itemId: 'syslog', - xtype: 'pveNodeSyslog' + xtype: 'pveLogView', + url: "/api2/json/nodes/" + nodename + "/syslog" }, { title: 'Task History', diff --git a/www/manager/openvz/Config.js b/www/manager/openvz/Config.js index f496e993..5fb5b3fc 100644 --- a/www/manager/openvz/Config.js +++ b/www/manager/openvz/Config.js @@ -53,6 +53,12 @@ Ext.define('PVE.openvz.Config', { xtype: 'pveBeanCounterGrid', url: '/api2/json/nodes/' + nodename + '/openvz/' + vmid + '/status/ubc' }, + { + title: "InitLog", + itemId: 'initlog', + xtype: 'pveLogView', + url: '/api2/json/nodes/' + nodename + '/openvz/' + vmid + '/initlog' + }, /* { xtype: 'pveOpenVZConsole',