summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2019-09-15 16:23:19 -0700
committerMicah Lee <micah@micahflee.com>2019-09-15 16:23:19 -0700
commitecd65f37e35fecbce5efd38173a7573feebaef0c (patch)
tree2d9e296c0cbd5870e475ad9470a00ba665e53c37
parentbb0908d6a3a8e51c938c22e24b5fa62c7cd05483 (diff)
downloadonionshare-ecd65f37e35fecbce5efd38173a7573feebaef0c.tar.gz
onionshare-ecd65f37e35fecbce5efd38173a7573feebaef0c.zip
Fix bug with rendering index.html files in subdirs
-rw-r--r--onionshare/web/website_mode.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/onionshare/web/website_mode.py b/onionshare/web/website_mode.py
index 0b7602ea..9dac8627 100644
--- a/onionshare/web/website_mode.py
+++ b/onionshare/web/website_mode.py
@@ -30,11 +30,13 @@ class WebsiteModeWeb(SendBaseModeWeb):
"""
return self.render_logic(path)
- def directory_listing_template(self, path, files, dirs):
+ def directory_listing_template(self, path, files, dirs, breadcrumbs, breadcrumbs_leaf):
return make_response(render_template('listing.html',
path=path,
files=files,
dirs=dirs,
+ breadcrumbs=breadcrumbs,
+ breadcrumbs_leaf=breadcrumbs_leaf,
static_url_path=self.web.static_url_path))
def set_file_info_custom(self, filenames, processed_size_callback):
@@ -51,7 +53,7 @@ class WebsiteModeWeb(SendBaseModeWeb):
index_path = os.path.join(path, 'index.html')
if index_path in self.files:
# Render it
- return self.stream_individual_file(filesystem_path)
+ return self.stream_individual_file(self.files[index_path])
else:
# Otherwise, render directory listing