proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-05-25 04:59:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes for new pve-access-control

Browse Source
This commit is contained in:
Dietmar Maurer 2012-05-22 11:41:52 +02:00
parent 5ad7ae4ac9
commit 3003548fad
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog.Debian vendored
View File

@ -1,3 +1,9 @@
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
defines.mk
View File

@ -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

9
www/manager/dc/AuthEdit.js
View File

@ -89,8 +89,9 @@ Ext.define('PVE.dc.AuthEdit', {
allowBlank: false allowBlank: false
}, },
{ {
xtype: 'textfield', xtype: 'pvetextfield',
fieldLabel: gettext('Fallback Server'), fieldLabel: gettext('Fallback Server'),
deleteEmpty: !me.create,
name: 'server2' name: 'server2'
}, },
{ {
@ -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;
} }

6
www/manager/dc/AuthView.js
View File

@ -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', {
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', {
"'" + 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;