[pve-devel] r6378 - in pve-manager/pve2: . lib/PVE/API2

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-07-28 12:22:42 +0200 (Thu, 28 Jul 2011)
New Revision: 6378

Modified:
   pve-manager/pve2/ChangeLog
   pve-manager/pve2/lib/PVE/API2/Cluster.pm
Log:


Modified: pve-manager/pve2/ChangeLog
===================================================================
--- pve-manager/pve2/ChangeLog	2011-07-28 10:21:04 UTC (rev 6377)
+++ pve-manager/pve2/ChangeLog	2011-07-28 10:22:42 UTC (rev 6378)
@@ -1,5 +1,7 @@
 2011-07-28  Proxmox Support Team  <support at proxmox.com>
 
+	* lib/PVE/API2/Cluster.pm: use PVE::Storage::storage_check_enabled()
+
 	* www/manager/form/ComboGrid.js: bug fix: sync selected after
 	creating the grid, make it work with multiSelect
 

Modified: pve-manager/pve2/lib/PVE/API2/Cluster.pm
===================================================================
--- pve-manager/pve2/lib/PVE/API2/Cluster.pm	2011-07-28 10:21:04 UTC (rev 6377)
+++ pve-manager/pve2/lib/PVE/API2/Cluster.pm	2011-07-28 10:22:42 UTC (rev 6378)
@@ -190,12 +190,11 @@
 	my @sids =  PVE::Storage::storage_ids ($cfg);
 
 	foreach my $storeid (@sids) {
-	    my $scfg =  PVE::Storage::storage_config ($cfg, $storeid);
-	    next if $scfg->{disable};
+	    my $scfg =  PVE::Storage::storage_config($cfg, $storeid);
 	    next if !$rpcenv->check($user, "/storage/$storeid", [ 'Datastore.Audit' ]);
 	    # we create a entry for each node
 	    foreach my $node (@$nodes) {
-		# fixme: check if storage is available on this node
+		next if !PVE::Storage::storage_check_enabled($cfg, $storeid, $node, 1);
 		my $entry = {
 		    id => "storage/$node/$storeid",
 		    storage => $storeid,