5apps/liquor-cabinet
5apps/liquor-cabinet
4
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Activity

Revert "Fix listing of a user's root directory"

Browse Source 
This reverts commit 1cf99377dc7ecf26fd2d5b43c03f615d82876d13.
This commit is contained in:
Greg Karékinian 2015-06-29 21:42:21 +02:00
parent 671d3d5fd5
commit 3ce3efd0fc
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/remote_storage/swift.rb
View File

@ -78,11 +78,7 @@ module RemoteStorage
end end
end end
res = if directory.empty? res = do_get_request("#{container_url_for(user)}/?format=json&path=#{escape(directory)}/")
do_get_request("#{container_url_for(user)}/?format=json")
else
do_get_request("#{container_url_for(user)}/?format=json&path=#{escape(directory)}/")
end
if body = JSON.parse(res.body) if body = JSON.parse(res.body)
listing = directory_listing(body) listing = directory_listing(body)
@ -282,12 +278,8 @@ module RemoteStorage
end end
def url_for_directory(user, directory) def url_for_directory(user, directory)
if directory.empty?
container_url_for(user)
else
"#{container_url_for(user)}/#{escape(directory)}" "#{container_url_for(user)}/#{escape(directory)}"
end end
end
def base_url def base_url
@base_url ||= settings.swift["host"] @base_url ||= settings.swift["host"]