Commit 1e341647 authored by Dietmar Maurer's avatar Dietmar Maurer

IPSet GUI: display errors

parent 778a7af5
...@@ -363,6 +363,20 @@ Ext.define('PVE.IPSetGrid', { ...@@ -363,6 +363,20 @@ Ext.define('PVE.IPSetGrid', {
} }
}); });
var render_errors = function(value, metaData, record) {
var errors = record.data.errors;
if (errors) {
var msg = errors.cidr || errors.nomatch;
if (msg) {
metaData.tdCls = 'x-form-invalid-field';
var html = '<p>' + Ext.htmlEncode(msg) + '</p>';
metaData.tdAttr = 'data-qwidth=600 data-qtitle="ERROR" data-qtip="' +
html.replace(/\"/g,'&quot;') + '"';
}
}
return value;
};
Ext.apply(me, { Ext.apply(me, {
tbar: [ '<b>IP/CIDR:</b>', me.addBtn, me.removeBtn, me.editBtn ], tbar: [ '<b>IP/CIDR:</b>', me.addBtn, me.removeBtn, me.editBtn ],
store: store, store: store,
...@@ -379,6 +393,7 @@ Ext.define('PVE.IPSetGrid', { ...@@ -379,6 +393,7 @@ Ext.define('PVE.IPSetGrid', {
dataIndex: 'cidr', dataIndex: 'cidr',
width: 150, width: 150,
renderer: function(value, metaData, record) { renderer: function(value, metaData, record) {
value = render_errors(value, metaData, record);
if (record.data.nomatch) { if (record.data.nomatch) {
return '<b>! </b>' + value; return '<b>! </b>' + value;
} }
...@@ -407,7 +422,7 @@ Ext.define('PVE.IPSetGrid', { ...@@ -407,7 +422,7 @@ Ext.define('PVE.IPSetGrid', {
Ext.define('pve-ipset', { Ext.define('pve-ipset', {
extend: 'Ext.data.Model', extend: 'Ext.data.Model',
fields: [ { name: 'nomatch', type: 'boolean' }, fields: [ { name: 'nomatch', type: 'boolean' },
'cidr', 'comment' ], 'cidr', 'comment', 'errors' ],
idProperty: 'cidr' idProperty: 'cidr'
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment