use Proxmox.Utils instead of PVE.Utils

[pve-manager.git] / www / manager6 / lxc / Resources.js

diff --git a/www/manager6/lxc/Resources.js b/www/manager6/lxc/Resources.js
index 03fd149cf04c11aba40e1f677dcd061706b52d99..40eefe1f68392151903e7de0c1b03a016d91221a 100644 (file)
--- a/www/manager6/lxc/Resources.js
+++ b/www/manager6/lxc/Resources.js
@@ -3,6 +3,8 @@ Ext.define('PVE.lxc.RessourceView', {
     extend: 'PVE.grid.ObjectGrid',
     alias: ['widget.pveLxcRessourceView'],
 
+    onlineHelp: 'pct_configuration',
+
     renderKey: function(key, metaData, rec, rowIndex, colIndex, store) {
        var me = this;
        var rows = me.rows;
@@ -45,7 +47,7 @@ Ext.define('PVE.lxc.RessourceView', {
                defaultValue: 512,
                tdCls: 'pve-itype-icon-memory',
                renderer: function(value) {
-                   return PVE.Utils.format_size(value*1024*1024);
+                   return Proxmox.Utils.format_size(value*1024*1024);
                }
            },
            swap: {
@@ -55,17 +57,28 @@ Ext.define('PVE.lxc.RessourceView', {
                defaultValue: 512,
                tdCls: 'pve-itype-icon-swap',
                renderer: function(value) {
-                   return PVE.Utils.format_size(value*1024*1024);
+                   return Proxmox.Utils.format_size(value*1024*1024);
+               }
+           },
+           cores: {
+               header: gettext('Cores'),
+               never_delete: true,
+               editor: caps.vms['VM.Config.CPU'] ? 'PVE.lxc.CPUEdit' : undefined,
+               defaultValue: '',
+               tdCls: 'pve-itype-icon-processor',
+               renderer: function(value) {
+                   if (value) { return value; }
+                   return gettext('unlimited');
                }
            },
            cpulimit: {
                header: gettext('CPU limit'),
                never_delete: true,
                editor: caps.vms['VM.Config.CPU'] ? 'PVE.lxc.CPUEdit' : undefined,
-               defaultValue: 1,
+               defaultValue: 0,
                tdCls: 'pve-itype-icon-processor',
                renderer: function(value) {
-                   if (value) { return value; }
+                   if (value > 0) { return value; }
                    return gettext('unlimited');
                }
            },
@@ -78,9 +91,12 @@ Ext.define('PVE.lxc.RessourceView', {
            },
            rootfs: {
                header: gettext('Root Disk'),
-               defaultValue: PVE.Utils.noneText,
+               defaultValue: Proxmox.Utils.noneText,
                editor: mpeditor,
                tdCls: 'pve-itype-icon-storage'
+           },
+           unprivileged: {
+               visible: false
            }
        };
 
@@ -128,6 +144,7 @@ Ext.define('PVE.lxc.RessourceView', {
            var win = Ext.create(editor, {
                pveSelNode: me.pveSelNode,
                confid: rec.data.key,
+               unprivileged: me.getObjectValue('unprivileged'),
                url: '/api2/extjs/' + baseurl
            });
 
@@ -153,7 +170,7 @@ Ext.define('PVE.lxc.RessourceView', {
        };
 
        var run_remove = function(b, e, rec) {
-           PVE.Utils.API2Request({
+           Proxmox.Utils.API2Request({
                url: '/api2/extjs/' + baseurl,
                waitMsgTarget: me,
                method: 'PUT',
@@ -169,7 +186,7 @@ Ext.define('PVE.lxc.RessourceView', {
            });
        };
 
-       var edit_btn = new PVE.button.Button({
+       var edit_btn = new Proxmox.button.Button({
            text: gettext('Edit'),
            selModel: sm,
            disabled: true,
@@ -183,14 +200,14 @@ Ext.define('PVE.lxc.RessourceView', {
            handler: run_editor
        });
 
-       var resize_btn = new PVE.button.Button({
+       var resize_btn = new Proxmox.button.Button({
            text: gettext('Resize disk'),
            selModel: sm,
            disabled: true,
            handler: run_resize
        });
 
-       var remove_btn = new PVE.button.Button({
+       var remove_btn = new Proxmox.button.Button({
            text: gettext('Remove'),
            selModel: sm,
            disabled: true,
@@ -199,7 +216,7 @@ Ext.define('PVE.lxc.RessourceView', {
                var msg = Ext.String.format(gettext('Are you sure you want to remove entry {0}'),
                                            "'" + me.renderKey(rec.data.key, {}, rec) + "'");
                if (rec.data.key.match(/^unused\d+$/)) {
-                   msg += " " + gettext('This will permanently erase all image data.');
+                   msg += " " + gettext('This will permanently erase all data.');
                }
 
                return msg;
@@ -253,6 +270,7 @@ Ext.define('PVE.lxc.RessourceView', {
                                handler: function() {
                                    var win = Ext.create('PVE.lxc.MountPointEdit', {
                                        url: '/api2/extjs/' + baseurl,
+                                       unprivileged: me.getObjectValue('unprivileged'),
                                        pveSelNode: me.pveSelNode
                                    });
                                    win.on('destroy', reload);
@@ -268,6 +286,7 @@ Ext.define('PVE.lxc.RessourceView', {
            ],
            rows: rows,
            listeners: {
+               afterrender: reload,
                activate: reload,
                itemdblclick: run_editor,
                selectionchange: set_button_status