diff options
| author | Saptak Sengupta <saptak013@gmail.com> | 2020-12-14 01:13:33 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-14 01:13:33 +0530 |
| commit | fffdbd4f12622c99851d90f3834d290487c83234 (patch) | |
| tree | 20a796d0f5fe1b2b3b7e694be005d20b3e48df56 | |
| parent | a520057bf4bd0956f03b763bfacdb8145cb5f977 (diff) | |
| parent | c949a731bb885a602000606426436384b9495cff (diff) | |
| download | onionshare-fffdbd4f12622c99851d90f3834d290487c83234.tar.gz onionshare-fffdbd4f12622c99851d90f3834d290487c83234.zip | |
Merge pull request #1244 from micahflee/1235_fix_download_error
Stop passing status_url_path to render denied template, to avoid exception
| -rw-r--r-- | cli/onionshare_cli/resources/templates/denied.html | 5 | ||||
| -rw-r--r-- | cli/onionshare_cli/web/share_mode.py | 11 |
2 files changed, 4 insertions, 12 deletions
diff --git a/cli/onionshare_cli/resources/templates/denied.html b/cli/onionshare_cli/resources/templates/denied.html index 49147ef2..e8c49f98 100644 --- a/cli/onionshare_cli/resources/templates/denied.html +++ b/cli/onionshare_cli/resources/templates/denied.html @@ -4,12 +4,11 @@ <head> <title>OnionShare</title> <meta charset="utf-8" /> - <meta name="viewport" content="width=device-width, initial-scale=1"> - <link href="{{ static_url_path }}/img/favicon.ico" rel="icon" type="image/x-icon" /> + <meta name="viewport" content="width=device-width, initial-scale=1"> </head> <body> <p>OnionShare download in progress</p> </body> -</html> +</html>
\ No newline at end of file diff --git a/cli/onionshare_cli/web/share_mode.py b/cli/onionshare_cli/web/share_mode.py index 39c82d31..87f35eaa 100644 --- a/cli/onionshare_cli/web/share_mode.py +++ b/cli/onionshare_cli/web/share_mode.py @@ -61,10 +61,7 @@ class ShareModeWeb(SendBaseModeWeb): and self.download_in_progress ) if deny_download: - r = make_response( - render_template("denied.html"), - static_url_path=self.web.static_url_path, - ) + r = make_response(render_template("denied.html")) return self.web.add_security_headers(r) # If download is allowed to continue, serve download page @@ -87,11 +84,7 @@ class ShareModeWeb(SendBaseModeWeb): and self.download_in_progress ) if deny_download: - r = make_response( - render_template( - "denied.html", static_url_path=self.web.static_url_path - ) - ) + r = make_response(render_template("denied.html")) return self.web.add_security_headers(r) # Prepare some variables to use inside generate() function below |