Fixed previews not reflecting changes to scheduled posts on Ghost(Pro) (

TryGhost#10601) closes TryGhost#10600 - modifies conditions for when to send a cache invalidation header for preview URLs to include changes to scheduled posts
allouis · Mar 12, 2019 · 507d8b3 · 507d8b3
1 parent 458a57b
commit 507d8b3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/core/server/api/v2/pages.js b/core/server/api/v2/pages.js
@@ -132,10 +132,15 @@ module.exports = {
         query(frame) {
             return models.Post.edit(frame.data.pages[0], frame.options)
                 .then((model) => {
-                    if (model.get('status') === 'published' && model.wasChanged() ||
-                        model.get('status') === 'draft' && model.previous('status') === 'published') {
+                    if (
+                        model.get('status') === 'published' && model.wasChanged() ||
+                        model.get('status') === 'draft' && model.previous('status') === 'published'
+                    ) {
                         this.headers.cacheInvalidate = true;
-                    } else if (model.get('status') === 'draft' && model.previous('status') !== 'published') {
+                    } else if (
+                        model.get('status') === 'draft' && model.previous('status') !== 'published' ||
+                        model.get('status') === 'scheduled' && model.wasChanged()
+                    ) {
                         this.headers.cacheInvalidate = {
                             value: urlService.utils.urlFor({
                                 relativeUrl: urlService.utils.urlJoin('/p', model.get('uuid'), '/')

diff --git a/core/server/api/v2/posts.js b/core/server/api/v2/posts.js
@@ -136,10 +136,15 @@ module.exports = {
         query(frame) {
             return models.Post.edit(frame.data.posts[0], frame.options)
                 .then((model) => {
-                    if (model.get('status') === 'published' && model.wasChanged() ||
-                        model.get('status') === 'draft' && model.previous('status') === 'published') {
+                    if (
+                        model.get('status') === 'published' && model.wasChanged() ||
+                        model.get('status') === 'draft' && model.previous('status') === 'published'
+                    ) {
                         this.headers.cacheInvalidate = true;
-                    } else if (model.get('status') === 'draft' && model.previous('status') !== 'published') {
+                    } else if (
+                        model.get('status') === 'draft' && model.previous('status') !== 'published' ||
+                        model.get('status') === 'scheduled' && model.wasChanged()
+                    ) {
                         this.headers.cacheInvalidate = {
                             value: urlService.utils.urlFor({
                                 relativeUrl: urlService.utils.urlJoin('/p', model.get('uuid'), '/')