From df717386234904504f9d880cab67ef03bef1c501 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Wed, 28 Mar 2018 23:38:09 +0200 Subject: [PATCH 1/4] Nodes preview now uses typewatch and csrf_token --- src/templates/layout.pug | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/templates/layout.pug b/src/templates/layout.pug index 08942cc..744b43f 100644 --- a/src/templates/layout.pug +++ b/src/templates/layout.pug @@ -322,6 +322,20 @@ html(lang="en") script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.bootstrap-3.3.7.min.js') }}") + | {% if current_user.is_authenticated %} + script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.typewatch-3.0.0.min.js') }}") + script. + // When sending an AJAX request, always add the X-CSRFToken header to it. + var csrf_token = "{{ csrf_token() }}"; + $.ajaxSetup({ + beforeSend: function (xhr, settings) { + if (!/^(GET|HEAD|OPTIONS|TRACE)$/i.test(settings.type) && !this.crossDomain) { + xhr.setRequestHeader("X-CSRFToken", csrf_token); + } + } + }); + | {% endif %} + script. $(document).ready(function() { {% if current_user.is_authenticated %} From a726fd1fbe380f41aa5e00f80b35c421ff2106ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 27 Mar 2018 16:42:34 +0200 Subject: [PATCH 2/4] Remove time from logs; timestamp is added by Apache anyway. --- docker/4_run/config_local.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/4_run/config_local.py b/docker/4_run/config_local.py index 22ffa5e..2ca1237 100644 --- a/docker/4_run/config_local.py +++ b/docker/4_run/config_local.py @@ -50,7 +50,7 @@ FILE_LINK_VALIDITY = defaultdict( LOGGING = { 'version': 1, 'formatters': { - 'default': {'format': '%(asctime)-15s %(levelname)8s %(name)s %(message)s'} + 'default': {'format': '%(levelname)8s %(name)s %(message)s'} }, 'handlers': { 'console': { From 0259c5e0ec7e3b66c9624f22d6d1782975af871d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 29 Mar 2018 17:34:22 +0200 Subject: [PATCH 3/4] Add clipboard.min.js to layout This is needed for the copy button on file asset uploading. Rather than including it on all pages that could feature the file uploader it's now loaded globally. --- src/templates/layout.pug | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/templates/layout.pug b/src/templates/layout.pug index 744b43f..239f1d5 100644 --- a/src/templates/layout.pug +++ b/src/templates/layout.pug @@ -32,8 +32,7 @@ html(lang="en") script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery-3.1.0.min.js')}}") script(src="{{ url_for('static_pillar', filename='assets/js/vendor/jquery.typeahead-0.11.1.min.js')}}") script(src="{{ url_for('static_pillar', filename='assets/js/vendor/js.cookie-2.0.3.min.js')}}") - - script. + script(src="{{ url_for('static_pillar', filename='assets/js/vendor/clipboard.min.js')}}") | {% if current_user.has_cap('subscriber') %} | {# Only load if we can comment (for converting markdown as-we-type) #} From 8c48a61114b77fa2a528492d9fd410e33d9976f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 3 Apr 2018 11:02:33 +0200 Subject: [PATCH 4/4] Switched attachment rendering to shortcode system Requires Pillar 3b452d14ce32e1a744fc526a922e1bb60b83ef25 or newer. --- cloud/routes.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/cloud/routes.py b/cloud/routes.py index 7509d17..9128049 100644 --- a/cloud/routes.py +++ b/cloud/routes.py @@ -62,15 +62,6 @@ def _homepage_context() -> dict: post.picture = get_file(post.picture, api=api) post.url = url_for_node(node=post) - # Render attachments - try: - post_contents = post['properties']['content'] - except KeyError: - log.warning('Blog post %s has no content', post._id) - else: - post['properties']['content'] = pillar.web.nodes.attachments.render_attachments( - post, post_contents) - # Get latest assets added to any project latest_assets = Node.latest('assets', api=api)