ui: fix align mode of two column container

[pve-manager.git] / www / manager6 / grid / PoolMembers.js

diff --git a/www/manager6/grid/PoolMembers.js b/www/manager6/grid/PoolMembers.js
index 6d0eb4a6adc6b09afbc44efbbcf7d150f480d0fd..75f20cab13023b6f07c88b7534f3f8c0f69fde7d 100644 (file)
--- a/www/manager6/grid/PoolMembers.js
+++ b/www/manager6/grid/PoolMembers.js
@@ -1,13 +1,13 @@
 Ext.define('PVE.pool.AddVM', {
     extend: 'Proxmox.window.Edit',
 
-    width: 600,
-    height: 420,
+    width: 640,
+    height: 480,
     isAdd: true,
     isCreate: true,
 
     extraRequestParams: {
-       transfer: 1,
+       'allow-move': 1,
     },
 
     initComponent: function() {
@@ -17,8 +17,9 @@ Ext.define('PVE.pool.AddVM', {
            throw "no pool specified";
        }
 
-       me.url = "/pools/" + me.pool;
+       me.url = '/pools/';
        me.method = 'PUT';
+       me.extraRequestParams.poolid = me.pool;
 
        var vmsField = Ext.create('Ext.form.field.Text', {
            name: 'vms',
@@ -44,7 +45,7 @@ Ext.define('PVE.pool.AddVM', {
        var vmGrid = Ext.create('widget.grid', {
            store: vmStore,
            border: true,
-           height: 300,
+           height: 360,
            scrollable: true,
            selModel: {
                selType: 'checkboxmodel',
@@ -70,19 +71,13 @@ Ext.define('PVE.pool.AddVM', {
                    dataIndex: 'node',
                },
                {
-                   header: gettext('Pool'),
+                   header: gettext('Current Pool'),
                    dataIndex: 'pool',
                },
                {
                    header: gettext('Status'),
                    dataIndex: 'uptime',
-                   renderer: function(value) {
-                       if (value) {
-                           return Proxmox.Utils.runningText;
-                       } else {
-                           return Proxmox.Utils.stoppedText;
-                       }
-                   },
+                   renderer: v => v ? Proxmox.Utils.runningText : Proxmox.Utils.stoppedText,
                },
                {
                    header: gettext('Name'),
@@ -126,8 +121,9 @@ Ext.define('PVE.pool.AddStorage', {
 
        me.isCreate = true;
        me.isAdd = true;
-       me.url = "/pools/" + me.pool;
+       me.url = "/pools/";
        me.method = 'PUT';
+       me.extraRequestParams.poolid = me.pool;
 
        Ext.apply(me, {
            subject: gettext('Storage'),
@@ -174,8 +170,8 @@ Ext.define('PVE.grid.PoolMembers', {
            ],
            proxy: {
                type: 'proxmox',
-               root: 'data.members',
-               url: "/api2/json/pools/" + me.pool,
+               root: 'data[0].members',
+               url: "/api2/json/pools/?poolid=" + me.pool,
            },
        });
 
@@ -198,7 +194,7 @@ Ext.define('PVE.grid.PoolMembers', {
                                         "'" + rec.data.id + "'");
            },
            handler: function(btn, event, rec) {
-               var params = { 'delete': 1 };
+               var params = { 'delete': 1, poolid: me.pool };
                if (rec.data.type === 'storage') {
                    params.storage = rec.data.storage;
                } else if (rec.data.type === 'qemu' || rec.data.type === 'lxc' || rec.data.type === 'openvz') {
@@ -208,7 +204,7 @@ Ext.define('PVE.grid.PoolMembers', {
                }
 
                Proxmox.Utils.API2Request({
-                   url: '/pools/' + me.pool,
+                   url: '/pools/',
                    method: 'PUT',
                    params: params,
                    waitMsgTarget: me,