also list pools with VM.Allocate permissions

PVE/API2/Pool.pm

@@ -23,7 +23,7 @@ __PACKAGE__->register_method ({
     method => 'GET',
     description => "Pool index.",
     permissions => { 
-	description => "List all pools where you have Pool.Allocate permissions on /pool/<pool>.",
+	description => "List all pools where you have Pool.Allocate or VM.Allocate permissions on /pool/<pool>.",
 	user => 'all',
     },
     parameters => {
@@ -51,7 +51,7 @@ __PACKAGE__->register_method ({
 	my $usercfg = $rpcenv->{user_cfg};
 
 	foreach my $pool (keys %{$usercfg->{pools}}) {
-	    next if !$rpcenv->check($authuser, "/pool/$pool", [ 'Pool.Allocate' ], 1);
+	    next if !$rpcenv->check_any($authuser, "/pool/$pool", [ 'Pool.Allocate', 'VM.Allocate' ], 1);
 
 	    my $entry = { poolid => $pool };
 	    my $data = $usercfg->{pools}->{$pool};
@@ -108,7 +108,7 @@ __PACKAGE__->register_method ({
     path => '{poolid}', 
     method => 'PUT',
     permissions => { 
-	description => "You aslo need the right to modify permissions on any object you add/delete.",
+	description => "You also need the right to modify permissions on any object you add/delete.",
 	check => ['perm', '/pool/{poolid}', ['Pool.Allocate']],
     },
     description => "Update pool data.",

debian/changelog.Debian

+pve-manager (2.1-8) unstable; urgency=low
+
+  * also list pools with VM.Allocate permissions
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 30 May 2012 11:20:45 +0200
+
 pve-manager (2.1-7) unstable; urgency=low
 
   * fix vzdump --exclude-path (allow to read value from vzdump.conf)

defines.mk

@@ -2,7 +2,7 @@ RELEASE=2.1
 
 VERSION=2.1
 PACKAGE=pve-manager
-PACKAGERELEASE=7
+PACKAGERELEASE=8
 
 BINDIR=${DESTDIR}/usr/bin
 PERLLIBDIR=${DESTDIR}/usr/share/perl5