use Proxmox.button.StdRemoveButton where possible

[pve-manager.git] / www / manager6 / panel / IPSet.js

diff --git a/www/manager6/panel/IPSet.js b/www/manager6/panel/IPSet.js
index 5e90ec4f0dc53eb87333651b37e1f54e1c6d1210..d4b36928e59169bb1d4c658ae4b601a74ff0de7a 100644 (file)
--- a/www/manager6/panel/IPSet.js
+++ b/www/manager6/panel/IPSet.js
@@ -1,3 +1,9 @@
+Ext.define('pve-fw-ipsets', {
+    extend: 'Ext.data.Model',
+    fields: [ 'name', 'comment', 'digest' ],
+    idProperty: 'name'
+});
+
 Ext.define('PVE.IPSetList', {
     extend: 'Ext.grid.Panel',
     alias: 'widget.pveIPSetList',
@@ -14,7 +20,7 @@ Ext.define('PVE.IPSetList', {
     editBtn: undefined,
 
     initComponent: function() {
-       /*jslint confusion: true */
+
         var me = this;
 
        if (me.ipset_panel == undefined) {
@@ -26,12 +32,11 @@ Ext.define('PVE.IPSetList', {
        }
 
        var store = new Ext.data.Store({
-           fields: [ 'name', 'comment', 'digest' ],
+           model: 'pve-fw-ipsets',
            proxy: {
                type: 'pve',
                url: "/api2/json" + me.base_url
            },
-           idProperty: 'name',
            sorters: {
                property: 'name',
                order: 'DESC'
@@ -124,25 +129,10 @@ Ext.define('PVE.IPSetList', {
            }
        });
 
-       me.removeBtn = new PVE.button.Button({
-           text: gettext('Remove'),
+       me.removeBtn = Ext.create('Proxmox.button.StdRemoveButton', {
            selModel: sm,
-           disabled: true,
-           handler: function() {
-               var rec = sm.getSelection()[0];
-               if (!rec || !me.base_url) {
-                   return;
-               }
-               PVE.Utils.API2Request({
-                   url: me.base_url + '/' + rec.data.name,
-                   method: 'DELETE',
-                   waitMsgTarget: me,
-                   failure: function(response, options) {
-                       Ext.Msg.alert(gettext('Error'), response.htmlStatus);
-                   },
-                   callback: reload
-               });
-           }
+           baseurl: me.base_url + '/',
+           callback: reload
        });
 
        Ext.apply(me, {
@@ -178,13 +168,13 @@ Ext.define('PVE.IPSetCidrEdit', {
     cidr: undefined,
 
     initComponent : function() {
-       /*jslint confusion: true */
+
        var me = this;
 
-       me.create = (me.cidr === undefined);
+       me.isCreate = (me.cidr === undefined);
 
 
-       if (me.create) {
+       if (me.isCreate) {
             me.url = '/api2/extjs' + me.base_url;
             me.method = 'POST';
         } else {
@@ -194,7 +184,7 @@ Ext.define('PVE.IPSetCidrEdit', {
 
        var column1 = [];
 
-       if (me.create) {
+       if (me.isCreate) {
            if (!me.list_refs_url) {
                throw "no alias_base_url specified";
            }
@@ -219,7 +209,7 @@ Ext.define('PVE.IPSetCidrEdit', {
        }
 
        var ipanel = Ext.create('PVE.panel.InputPanel', {
-           create: me.create,
+           isCreate: me.isCreate,
            column1: column1,
            column2: [
                {
@@ -247,7 +237,7 @@ Ext.define('PVE.IPSetCidrEdit', {
 
        me.callParent();
 
-       if (!me.create) {
+       if (!me.isCreate) {
            me.load({
                success:  function(response, options) {
                    var values = response.result.data;
@@ -282,6 +272,7 @@ Ext.define('PVE.IPSetGrid', {
            me.store.removeAll();
        } else {
            me.addBtn.setDisabled(false);
+           me.removeBtn.baseurl = url + '/';
            me.store.setProxy({
                type: 'pve',
                url: '/api2/json' + url
@@ -345,26 +336,10 @@ Ext.define('PVE.IPSetGrid', {
            }
        });
 
-       me.removeBtn = new PVE.button.Button({
-           text: gettext('Remove'),
+       me.removeBtn = Ext.create('Proxmox.button.StdRemoveButton', {
            selModel: sm,
-           disabled: true,
-           handler: function() {
-               var rec = sm.getSelection()[0];
-               if (!rec || !me.base_url) {
-                   return;
-               }
-
-               PVE.Utils.API2Request({
-                   url: me.base_url + '/' + rec.data.cidr,
-                   method: 'DELETE',
-                   waitMsgTarget: me,
-                   failure: function(response, options) {
-                       Ext.Msg.alert(gettext('Error'), response.htmlStatus);
-                   },
-                   callback: reload
-               });
-           }
+           baseurl: me.base_url + '/',
+           callback: reload
        });
 
        var render_errors = function(value, metaData, record) {
@@ -372,7 +347,7 @@ Ext.define('PVE.IPSetGrid', {
            if (errors) {
                var msg = errors.cidr || errors.nomatch;
                if (msg) {
-                   metaData.tdCls = 'x-form-invalid-field';
+                   metaData.tdCls = 'proxmox-invalid-row';
                    var html = '<p>' +  Ext.htmlEncode(msg) + '</p>';
                    metaData.tdAttr = 'data-qwidth=600 data-qtitle="ERROR" data-qtip="' + 
                        html.replace(/\"/g,'&quot;') + '"';