From 3003548fad5adfdf1a2aaa74b05c5c8f4cb1ff4c Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Tue, 22 May 2012 11:41:52 +0200
Subject: [PATCH] fixes for new pve-access-control

---
 debian/changelog.Debian    |  6 ++++++
 defines.mk                 |  2 +-
 www/manager/dc/AuthEdit.js | 11 ++++++++---
 www/manager/dc/AuthView.js |  6 +++---
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/debian/changelog.Debian b/debian/changelog.Debian
index 45a0fcf5..5c8c4c44 100644
--- a/debian/changelog.Debian
+++ b/debian/changelog.Debian
@@ -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
 
   * updated russian translation
diff --git a/defines.mk b/defines.mk
index 9ad7a50f..d93de155 100644
--- a/defines.mk
+++ b/defines.mk
@@ -2,7 +2,7 @@ RELEASE=2.1
 
 VERSION=2.1
 PACKAGE=pve-manager
-PACKAGERELEASE=4
+PACKAGERELEASE=5
 
 BINDIR=${DESTDIR}/usr/bin
 PERLLIBDIR=${DESTDIR}/usr/share/perl5
diff --git a/www/manager/dc/AuthEdit.js b/www/manager/dc/AuthEdit.js
index 76874988..c40c2654 100644
--- a/www/manager/dc/AuthEdit.js
+++ b/www/manager/dc/AuthEdit.js
@@ -89,9 +89,10 @@ Ext.define('PVE.dc.AuthEdit', {
                 allowBlank: false
             },
             {
-                xtype: 'textfield',
+                xtype: 'pvetextfield',
                 fieldLabel: gettext('Fallback Server'),
-                name: 'server2'
+		deleteEmpty: !me.create,
+		name: 'server2'
             },
             {
                 xtype: 'numberfield',
@@ -115,8 +116,12 @@ Ext.define('PVE.dc.AuthEdit', {
 	    column2: column2,
 	    onGetValues: function(values) {
 		if (!values.port) {
-		    values.port = 0;
+		    if (!me.create) {
+			PVE.Utils.assemble_field_data(values, { 'delete': 'port' });
+		    }
+		    delete values.port;
 		}
+
 		if (me.create) {
 		    values.type = me.authType;
 		}
diff --git a/www/manager/dc/AuthView.js b/www/manager/dc/AuthView.js
index fe566775..08830aca 100644
--- a/www/manager/dc/AuthView.js
+++ b/www/manager/dc/AuthView.js
@@ -26,7 +26,7 @@ Ext.define('PVE.dc.AuthView', {
 		return;
 	    }
 
-	    if (rec.data.type === 'builtin') {
+	    if (rec.data.type === 'pve' || rec.data.type === 'pam') {
 		return;
 	    }
 
@@ -43,7 +43,7 @@ Ext.define('PVE.dc.AuthView', {
 	    disabled: true,
 	    selModel: sm,
 	    enableFn: function(rec) {
-		return rec.data.type !== 'builtin';
+		return !(rec.data.type === 'pve' || rec.data.type === 'pam');
 	    },
 	    handler: run_editor
 	});
@@ -57,7 +57,7 @@ Ext.define('PVE.dc.AuthView', {
 					 "'" + rec.data.realm + "'");
 	    },
 	    enableFn: function(rec) {
-		return rec.data.type !== 'builtin';
+		return !(rec.data.type === 'pve' || rec.data.type === 'pam');
 	    },
 	    handler: function(btn, event, rec) {
 		var realm = rec.data.realm;