Merge branch 'master' of github.com:datopian/frontend-v2

datopian · Nov 7, 2019 · 27e4869 · 27e4869
2 parents 5d2b715 + c15d4c9
commit 27e4869
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 9 deletions.
diff --git a/plugins/wp/cms.js b/plugins/wp/cms.js
@@ -11,15 +11,34 @@ class CmsModel {
   }
 
 
-  getPost(slug) {
-    return new Promise((resolve, reject) => {
-      this.blog.post({slug: slug}).getBySlug((err, data) => {
-        if (err) {
-          reject(err)
-        } else {
-          resolve(data)
+  async getPost(slug, parentSlug = "") {
+
+    return new Promise(async (resolve, reject) => {
+
+      // type any will request both pages and posts
+      let query = {type: 'any'}
+
+      if (parentSlug) {
+        try {
+          let parent = await (await this.blog.post({slug: parentSlug})).getBySlug()
+          query.parent_id = parent.ID
+          let posts = (await this.blog.postsList(query)).posts
+          let post = posts.find(post => post.slug == slug)
+          resolve(post)
+        } catch (e) {
+          reject(e)
         }
-      })
+
+      } else {
+        query.slug = slug
+        this.blog.post(query).getBySlug((err, data) => {
+          if (err) {
+            reject(err)
+          } else {
+            resolve(data)
+          }
+        })
+      }
     })
   }
 

diff --git a/plugins/wp/index.js b/plugins/wp/index.js
@@ -108,7 +108,7 @@ module.exports = function (app) {
       slug += `-${locale}`
     }
     try {
-      const post = await Model.getPost(slug)
+      const post = await Model.getPost(req.params.page, req.params.parent)
       res.render('static.html', {
         slug: post.slug,
         parentSlug: req.params.parent,