diff options
| author | Clemens <cle1000.cb@gmail.com> | 2016-08-04 09:34:36 +0200 |
|---|---|---|
| committer | Clemens <cle1000.cb@gmail.com> | 2016-08-04 09:34:36 +0200 |
| commit | a8aa1f2d1c8fe19313ca8abe07f9d6aa431fc3c3 (patch) | |
| tree | 051a2dad1ab766f5101f846cdb32ce8ca3e47e43 | |
| parent | fd7b6b958e7da1073b68a13e817ceaacaf6ad28c (diff) | |
| download | mitmproxy-a8aa1f2d1c8fe19313ca8abe07f9d6aa431fc3c3.tar.gz mitmproxy-a8aa1f2d1c8fe19313ca8abe07f9d6aa431fc3c3.tar.bz2 mitmproxy-a8aa1f2d1c8fe19313ca8abe07f9d6aa431fc3c3.zip | |
fix get contentview in mitmweb
| -rw-r--r-- | mitmproxy/web/app.py | 6 | ||||
| -rw-r--r-- | web/src/js/components/ContentView.jsx | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/mitmproxy/web/app.py b/mitmproxy/web/app.py index 5c95c06f..18745f5b 100644 --- a/mitmproxy/web/app.py +++ b/mitmproxy/web/app.py @@ -363,9 +363,11 @@ class FlowContentView(RequestHandler): self.set_header("Content-Encoding", "") - description, lines = contentviews.get_content_view_with_message_encoding( - message, contentviews.get(content_view.replace('_', ' ')) + description, lines, error = contentviews.get_message_content_view( + contentviews.get(content_view.replace('_', ' ')), message ) +# if error: +# add event log self.write(dict( lines=list(lines), diff --git a/web/src/js/components/ContentView.jsx b/web/src/js/components/ContentView.jsx index 9ec283ca..128d8e81 100644 --- a/web/src/js/components/ContentView.jsx +++ b/web/src/js/components/ContentView.jsx @@ -39,7 +39,7 @@ function ContentView(props) { <div className="contentview"> <View flow={flow} message={message} contentView={contentView} readonly={readonly} onChange={onContentChange}/> <ShowFullContentButton/> - <div className="view-options"> + <div className="view-options footer navbar-fixed-bottom"> <ViewSelector message={message}/> <DownloadContentButton flow={flow} message={message}/> |