also list pools with VM.Allocate permissions

diff --git a/PVE/API2/Pool.pm b/PVE/API2/Pool.pm
index 4c4b757469db9202568c0cc2a765ba82c840a50e..bd602eca29baa97f6badfa253d197e14e329677d 100644 (file)
--- a/PVE/API2/Pool.pm
+++ b/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.",

diff --git a/debian/changelog.Debian b/debian/changelog.Debian
index cec84edc614dbc3997dbab8c1686c6e5aa80bf5c..73449dece5065b8ccbbe8d652c05800fde1cd046 100644 (file)
--- a/debian/changelog.Debian
+++ b/debian/changelog.Debian
@@ -1,3 +1,9 @@
+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)

diff --git a/defines.mk b/defines.mk
index 13f8411a2d60aa86a15ff2d2258630c0ae580090..6c224b78d116507d81136d941da2d758bed76bf2 100644 (file)
--- a/defines.mk
+++ b/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