Commit 0fa60f36 authored by Dietmar Maurer's avatar Dietmar Maurer

fixes for new pve-access-control

parent 8fac8bf0
pve-manager (2.1-5) unstable; urgency=low
* fixes for new pve-access-control (Auth plugins).
-- Proxmox Support Team <support@proxmox.com> Tue, 22 May 2012 10:49:37 +0200
pve-manager (2.1-4) unstable; urgency=low pve-manager (2.1-4) unstable; urgency=low
* updated russian translation * updated russian translation
......
...@@ -2,7 +2,7 @@ RELEASE=2.1 ...@@ -2,7 +2,7 @@ RELEASE=2.1
VERSION=2.1 VERSION=2.1
PACKAGE=pve-manager PACKAGE=pve-manager
PACKAGERELEASE=4 PACKAGERELEASE=5
BINDIR=${DESTDIR}/usr/bin BINDIR=${DESTDIR}/usr/bin
PERLLIBDIR=${DESTDIR}/usr/share/perl5 PERLLIBDIR=${DESTDIR}/usr/share/perl5
......
...@@ -89,9 +89,10 @@ Ext.define('PVE.dc.AuthEdit', { ...@@ -89,9 +89,10 @@ Ext.define('PVE.dc.AuthEdit', {
allowBlank: false allowBlank: false
}, },
{ {
xtype: 'textfield', xtype: 'pvetextfield',
fieldLabel: gettext('Fallback Server'), fieldLabel: gettext('Fallback Server'),
name: 'server2' deleteEmpty: !me.create,
name: 'server2'
}, },
{ {
xtype: 'numberfield', xtype: 'numberfield',
...@@ -115,8 +116,12 @@ Ext.define('PVE.dc.AuthEdit', { ...@@ -115,8 +116,12 @@ Ext.define('PVE.dc.AuthEdit', {
column2: column2, column2: column2,
onGetValues: function(values) { onGetValues: function(values) {
if (!values.port) { if (!values.port) {
values.port = 0; if (!me.create) {
PVE.Utils.assemble_field_data(values, { 'delete': 'port' });
}
delete values.port;
} }
if (me.create) { if (me.create) {
values.type = me.authType; values.type = me.authType;
} }
......
...@@ -26,7 +26,7 @@ Ext.define('PVE.dc.AuthView', { ...@@ -26,7 +26,7 @@ Ext.define('PVE.dc.AuthView', {
return; return;
} }
if (rec.data.type === 'builtin') { if (rec.data.type === 'pve' || rec.data.type === 'pam') {
return; return;
} }
...@@ -43,7 +43,7 @@ Ext.define('PVE.dc.AuthView', { ...@@ -43,7 +43,7 @@ Ext.define('PVE.dc.AuthView', {
disabled: true, disabled: true,
selModel: sm, selModel: sm,
enableFn: function(rec) { enableFn: function(rec) {
return rec.data.type !== 'builtin'; return !(rec.data.type === 'pve' || rec.data.type === 'pam');
}, },
handler: run_editor handler: run_editor
}); });
...@@ -57,7 +57,7 @@ Ext.define('PVE.dc.AuthView', { ...@@ -57,7 +57,7 @@ Ext.define('PVE.dc.AuthView', {
"'" + rec.data.realm + "'"); "'" + rec.data.realm + "'");
}, },
enableFn: function(rec) { enableFn: function(rec) {
return rec.data.type !== 'builtin'; return !(rec.data.type === 'pve' || rec.data.type === 'pam');
}, },
handler: function(btn, event, rec) { handler: function(btn, event, rec) {
var realm = rec.data.realm; var realm = rec.data.realm;
......
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