fix: The republish-all feature didn't take the type='data' selected b…

…y the user
abecms · Jul 9, 2017 · 08072c8 · 08072c8
1 parent 8b880a1
commit 08072c8
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 31 deletions.
diff --git a/src/cli/cms/data/source.js b/src/cli/cms/data/source.js
@@ -147,7 +147,7 @@ export function fileList(obj, tplPath, match, jsonPage) {
   return p
 }
 
-export function nextDataList(tplPath, jsonPage, match, onlyDynamicSelect) {
+export function nextDataList(tplPath, jsonPage, match) {
   var p = new Promise((resolve) => {
     if(jsonPage['abe_source'] == null) {
       jsonPage['abe_source'] = {}
@@ -160,40 +160,36 @@ export function nextDataList(tplPath, jsonPage, match, onlyDynamicSelect) {
 
     switch (type) {
     case 'request':
-      if (onlyDynamicSelect && obj.editable) {
-        resolve()
-      }else {
-        requestList(obj, tplPath, match, jsonPage)
-            .then((jsonPage) => {
-              resolve(jsonPage)
-            }).catch((e) => {
-              console.log('[ERROR] source.js requestList', e)
-            })
-      }
+      requestList(obj, tplPath, match, jsonPage)
+        .then((jsonPage) => {
+          resolve(jsonPage)
+        }).catch((e) => {
+          console.log('[ERROR] source.js requestList', e)
+        })
       break
     case 'value':
       valueList(obj, match, jsonPage)
-          .then(() => {
-            resolve()
-          }).catch((e) => {
-            console.log('[ERROR] source.js valueList', e)
-          })
+        .then(() => {
+          resolve()
+        }).catch((e) => {
+          console.log('[ERROR] source.js valueList', e)
+        })
       break
     case 'url':
       urlList(obj, tplPath, match, jsonPage)
-          .then(() => {
-            resolve()
-          }).catch((e) => {
-            console.log('[ERROR] source.js urlList', e)
-          })
+        .then(() => {
+          resolve()
+        }).catch((e) => {
+          console.log('[ERROR] source.js urlList', e)
+        })
       break
     case 'file':
       fileList(obj, tplPath, match, jsonPage)
-          .then(() => {
-            resolve()
-          }).catch((e) => {
-            console.log('[ERROR] source.js fileList', e)
-          })
+        .then(() => {
+          resolve()
+        }).catch((e) => {
+          console.log('[ERROR] source.js fileList', e)
+        })
       break
     default:
       resolve()
@@ -204,13 +200,13 @@ export function nextDataList(tplPath, jsonPage, match, onlyDynamicSelect) {
   return p
 }
 
-export function getDataList(tplPath, text, jsonPage, onlyDynamicSelect = false) {
+export function getDataList(tplPath, text, jsonPage) {
   var p = new Promise((resolve) => {
 
     var promises = []
     var matches = cmsData.regex.getTagAbeTypeRequest(text)
     Array.prototype.forEach.call(matches, (match) => {
-      promises.push(nextDataList(tplPath, jsonPage, match[0], onlyDynamicSelect))
+      promises.push(nextDataList(tplPath, jsonPage, match[0]))
     })
 
     Promise.all(promises)

diff --git a/src/cli/process/generate-posts.js b/src/cli/process/generate-posts.js
@@ -24,10 +24,10 @@ function publishNext(files, tt, cb, i = 0) {
     i++
     var p = new Promise((resolve) => {
       if(typeof templatesTexts[jsonObject.abe_meta.template] === 'undefined' || templatesTexts[jsonObject.abe_meta.template] === null) {
-        templatesTexts[jsonObject.abe_meta.template] = cmsTemplates.template.getTemplate(jsonObject.abe_meta.template)
+        templatesTexts[jsonObject.abe_meta.template] = cmsTemplates.template.getTemplate(jsonObject.abe_meta.template, jsonObject)
       }
 
-      cmsData.source.getDataList(path.dirname(jsonObject.abe_meta.link), templatesTexts[jsonObject.abe_meta.template], jsonObject, true)
+      cmsData.source.getDataList(path.dirname(jsonObject.abe_meta.link), templatesTexts[jsonObject.abe_meta.template], jsonObject)
         .then(() => {
           jsonObject = abeExtend.hooks.instance.trigger('afterGetDataListOnSave', jsonObject)
 
@@ -59,7 +59,7 @@ function publishNext(files, tt, cb, i = 0) {
                 const fileName = path.basename(obj.json.content.abe_meta.link, '.'+config.files.templates.extension) + '.' + extension
                 const relPath = path.join(config.root, processConfig.ABE_DESTINATION, relatedTemplate.path, fileName)
 
-                cmsData.source.getDataList(path.dirname(obj.json.content.abe_meta.link), relTemplate, obj.json.content, true)
+                cmsData.source.getDataList(path.dirname(obj.json.content.abe_meta.link), relTemplate, obj.json.content)
                 .then(() => {
                   const page = new Page(relTemplate, obj.json.content, true)
                   cmsOperations.save.saveHtml(relPath, page.html)