kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

fix the thing I just broke :(

Browse source
This commit is contained in:
geemus (Wesley Beary) 2010-03-08 16:19:48 -08:00
parent d1f625bf81
commit b5d5dc19fc
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/fog/aws/models/s3/files.rb
View file

@ -14,12 +14,12 @@ module Fog
def all(options = {})
merge_attributes(options)
directory = directory.collection.get(
parent = directory.collection.get(
directory.name,
options
)
if directory
load(directory.files.map {|file| file.attributes})
if parent
load(parent.files.map {|file| file.attributes})
else
nil
end

6
lib/fog/rackspace/models/files/files.rb
View file

@ -13,12 +13,12 @@ module Fog
def all(options = {})
merge_attributes(options)
directory = directory.collection.get(
parent = directory.collection.get(
directory.name,
options
)
if directory
load(directory.files.map {|file| file.attributes})
if parent
load(parent.files.map {|file| file.attributes})
else
nil
end