refactor: url /abe/

AdFabConnect · Oct 28, 2016 · c89dcf5 · c89dcf5
1 parent 3606af2
commit c89dcf5
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 37 deletions.
diff --git a/src/cli/cms/operations/post.js b/src/cli/cms/operations/post.js
@@ -9,6 +9,37 @@ import {
   Manager
 } from '../../'
 
+export function draft(filePath, tplPath, json, workflow = 'draft', type = 'draft') {
+  var p = new Promise((resolve, reject) => {
+    abeExtend.hooks.instance.trigger('beforeDraft', json, filePath, tplPath)
+    cmsOperations.save.save(
+      path.join(config.root, config.draft.url, filePath.replace(config.root)),
+      tplPath,
+      json,
+      '',
+      workflow,
+      null,
+      type)
+      .then((resSave) => {
+        var result
+        if(typeof resSave.error !== 'undefined' && resSave.error !== null  ){
+          result = {error: resSave.error}
+        }else if(typeof resSave.reject !== 'undefined' && resSave.reject !== null){
+          result = resSave
+        }else if(typeof resSave.json !== 'undefined' && resSave.json !== null){
+          Manager.instance.updateList()
+          result = {
+            success: 1,
+            json: resSave.json
+          }
+        }
+        resolve(result)
+      })
+    })
+
+  return p
+}
+
 export function publish(filePath, tplPath, json) {
   var p = new Promise((resolve, reject) => {
     abeExtend.hooks.instance.trigger('beforePublish', json, filePath, tplPath)

diff --git a/src/server/controllers/index.js b/src/server/controllers/index.js
@@ -35,10 +35,10 @@ router.get('/abe/update*', getUpdate)
 router.post('/abe/sql-request*', postSqlRequest)
 router.post('/abe/page/*', postPage)
 router.get('/abe/page/*', getPage)
-router.post('/abe/publish', postPublish)
+router.post('/abe/publish*', postPublish)
 router.get('/abe/republish', getRepublish)
-router.post('/abe/reject', postReject)
-router.post('/abe/draft', postDraft)
+router.post('/abe/reject*', postReject)
+router.post('/abe/draft*', postDraft)
 router.get('/abe/save-config', getSaveConfig)
 router.get('/abe/unpublish*', getUnpublish)
 router.get('/abe/delete*', getDelete)

diff --git a/src/server/public/scripts/modules/EditorJson.js b/src/server/public/scripts/modules/EditorJson.js
@@ -43,17 +43,18 @@ export default class Json {
         delete json.abe_source
       }
 
+      tplPath = (tplPath != null) ? tplPath : CONFIG.TPLPATH
+      filePath = (filePath != null) ? filePath : CONFIG.FILEPATH
+
       var toSave = qs.stringify({
-        tplPath: (tplPath) ? tplPath : CONFIG.TPLPATH,
-        filePath: (filePath) ? filePath : CONFIG.FILEPATH,
         json: jsonSave
       })
 
       this.headersSaving._fire({url: document.location.origin + '/' + type})
 
       this._ajax(
         {
-          url: document.location.origin + '/abe/' + type,
+          url: document.location.origin + '/abe/' + type + filePath,
           body: toSave,
           headers: this._headers,
           method: 'post'

diff --git a/src/server/routes/post-draft.js b/src/server/routes/post-draft.js
@@ -9,33 +9,26 @@ import {
 var route = function(req, res, next){
   abeExtend.hooks.instance.trigger('beforeRoute', req, res, next)
   if(typeof res._header !== 'undefined' && res._header !== null) return
-  cmsOperations.save.save(
-    path.join(config.root, config.draft.url, req.body.filePath.replace(config.root)),
-    req.body.tplPath,
-    req.body.json,
-    '',
-    'draft',
-    null,
-    'draft')
-    .then((resSave) => {
-      if(typeof resSave.error !== 'undefined' && resSave.error !== null  ){
-        res.set('Content-Type', 'application/json')
-        res.send(JSON.stringify({error: resSave.error}))
-      }
-      var result
-      if(typeof resSave.reject !== 'undefined' && resSave.reject !== null){
-        result = resSave
-      }
-      if(typeof resSave.json !== 'undefined' && resSave.json !== null){
-        Manager.instance.updateList()
-        result = {
-          success: 1,
-          json: resSave.json
-        }
-      }
-      res.set('Content-Type', 'application/json')
-      res.send(JSON.stringify(result))
-    })
+
+  var filePath = req.originalUrl.replace('/abe/draft', '')
+  var json = req.body.json
+
+  var p = cmsOperations.post.draft(
+    filePath, 
+    json.abe_meta.template,
+    json
+  )
+
+  p.then((result) => {
+    res.set('Content-Type', 'application/json')
+    res.send(JSON.stringify(result))
+  },
+  (result) => {
+    res.set('Content-Type', 'application/json')
+    res.send(JSON.stringify(result))
+  }).catch(function(e) {
+    console.error('[ERROR] post-draft.js', e)
+  })
 }
 
 export default route
diff --git a/src/server/routes/post-publish.js b/src/server/routes/post-publish.js
@@ -9,10 +9,13 @@ var route = function(req, res, next){
   abeExtend.hooks.instance.trigger('beforeRoute', req, res, next)
   if(typeof res._header !== 'undefined' && res._header !== null) return
 
+  var filePath = req.originalUrl.replace('/abe/publish', '')
+  var json = req.body.json
+
   var p = cmsOperations.post.publish(
-    req.body.filePath, 
-    req.body.tplPath,
-    req.body.json
+    filePath, 
+    json.abe_meta.template,
+    json
   )
 
   p.then((result) => {

diff --git a/src/server/routes/post-reject.js b/src/server/routes/post-reject.js
@@ -9,9 +9,11 @@ import {
 var route = function(req, res, next){
   abeExtend.hooks.instance.trigger('beforeRoute', req, res, next)
   if(typeof res._header !== 'undefined' && res._header !== null) return
+
+  var filePath = req.originalUrl.replace('/abe/reject', '')
 
   var p = cmsOperations.post.reject(
-    req.body.filePath, 
+    filePath, 
     req.body.tplPath,
     req.body.json
   )