Feature: precontrib bug update and duplicate

AdFabConnect · Nov 14, 2016 · 0dcc554 · 0dcc554
1 parent 2980fc3
commit 0dcc554
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 17 deletions.
diff --git a/src/cli/cms/operations/duplicate.js b/src/cli/cms/operations/duplicate.js
@@ -1,4 +1,5 @@
 import path from 'path'
+import extend from 'extend'
 
 import {
   abeExtend,
@@ -26,6 +27,11 @@ const duplicate = function(oldPostUrl, template, newPath, name, req, isUpdate =
         revisions = posts[0].revisions
         if(revisions != null && revisions[0] != null) {
           json = cmsData.file.get(revisions[0].path)
+
+          json = extend(true, json, req.body)
+          console.log('* * * * * * * * * * * * * * * * * * * * * * * * * * * * *')
+          console.log('json', json)
+
           delete json.abe_meta
         }
       }

diff --git a/src/server/controllers/index.js b/src/server/controllers/index.js
@@ -2,8 +2,8 @@ import express from 'express'
 import * as abe from '../../cli'
 import {
   postCreate
-  ,getDuplicate
-  ,getUpdate
+  ,postDuplicate
+  ,postUpdate
   ,getListUrl
   ,getListHooks
   ,getMain
@@ -32,8 +32,8 @@ abeExtend.hooks.instance.trigger('afterHandlebarsHelpers', Handlebars)
 abeExtend.hooks.instance.trigger('beforeAddRoute', router)
 
 router.post('/abe/create*', postCreate)
-router.get('/abe/duplicate*', getDuplicate)
-router.get('/abe/update*', getUpdate)
+router.post('/abe/duplicate*', postDuplicate)
+router.post('/abe/update*', postUpdate)
 router.post('/abe/sql-request*', postSqlRequest)
 router.post('/abe/page/*', postPage)
 router.get('/abe/page/*', getPage)

diff --git a/src/server/public/scripts/modules/FormCreate.js b/src/server/public/scripts/modules/FormCreate.js
@@ -18,13 +18,8 @@ export default class FormCreate {
       this._form = document.querySelector('.form-create')
 
       this._formInputs = [].slice.call(this._form.querySelectorAll('input, select'))
-      // this._formInputs = this._formInputs.concat([].slice.call(this._form.querySelectorAll('select')))
 
-      // this._templateName = this._form.querySelector('[data-type-template-abe]')
-      // this._tplName = this._form.querySelector('[name=tplName]')
       this._submitBtn = this._form.querySelector('button[type=submit]')
-      // this._inputs = [].slice.call(this._form.querySelectorAll('input[type=text]'))
-      // this._selects = [].slice.call(this._form.querySelectorAll('select[id*="level-"]'))
 
       // // constantes methodes
       // this._handlePathChange = this._pathChange.bind(this)

diff --git a/src/server/routes/index.js b/src/server/routes/index.js
@@ -1,7 +1,7 @@
 import getMain from './get-main'
 import postCreate from './post-create'
-import getDuplicate from './get-duplicate'
-import getUpdate from './get-update'
+import postDuplicate from './post-duplicate'
+import postUpdate from './post-update'
 import getListUrl from './get-list-url'
 import getListHooks from './get-list-hooks'
 import getPage from './get-page'
@@ -23,8 +23,8 @@ export {
 	,postCreate
 	,getListUrl
 	,getListHooks
-	,getDuplicate
-	,getUpdate
+	,postDuplicate
+	,postUpdate
 	,getPage
 	,postPage
 	,postPublish

diff --git a/src/server/routes/get-duplicate.js → src/server/routes/post-duplicate.js b/src/server/routes/get-duplicate.js → src/server/routes/post-duplicate.js
@@ -6,7 +6,12 @@ import {
 var route = function(req, res, next) {
   abeExtend.hooks.instance.trigger('beforeRoute', req, res, next)
 
-  var p = cmsOperations.duplicate(req.query.oldFilePath, req.query.selectTemplate, req.query.filePath, req.query.tplName, req)
+  var filepath = req.originalUrl.replace('/abe/duplicate', '')
+  var folderName = filepath.split('/')
+  var postName = folderName.pop()
+  folderName = folderName.join('/')
+
+  var p = cmsOperations.duplicate(req.body.oldFilePath, req.body.selectTemplate, folderName, postName, req)
 
   p.then((resSave) => {
     var result = {

diff --git a/src/server/routes/get-update.js → src/server/routes/post-update.js b/src/server/routes/get-update.js → src/server/routes/post-update.js
@@ -6,7 +6,12 @@ import {
 var route = function(req, res, next) {
   abeExtend.hooks.instance.trigger('beforeRoute', req, res, next)
 
-  var p = cmsOperations.duplicate(req.query.oldFilePath, req.query.selectTemplate, req.query.filePath, req.query.tplName, req, true)
+  var filepath = req.originalUrl.replace('/abe/update', '')
+  var folderName = filepath.split('/')
+  var postName = folderName.pop()
+  folderName = folderName.join('/')
+
+  var p = cmsOperations.duplicate(req.body.oldFilePath, req.body.selectTemplate, folderName, postName, req, true)
 
   p.then((resSave) => {
     var result = {

diff --git a/src/server/views/partials/create.html b/src/server/views/partials/create.html
@@ -29,8 +29,8 @@ <h1>
             </div>
           </div>
 
-          <input class="form-control" type="hidden" name="filePath" id="filePath" value="{{@root.folderPath}}" />
-          <input class="form-control" type="hidden" name="oldFilePath" id="oldFilePath" value="{{json.abe_meta.link}}" />
+          <input class="form-control" type="hidden" name="filePath" data-id="filePath" id="filePath" value="{{@root.folderPath}}" />
+          <input class="form-control" type="hidden" name="oldFilePath" data-id="oldFilePath" id="oldFilePath" value="{{json.abe_meta.link}}" />
 
         </form>
       </div>