bug: Status DRAFT displayed in the manager

abecms · Oct 20, 2016 · c642ba5 · c642ba5
1 parent 516dcf2
commit c642ba5
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 20 deletions.
diff --git a/src/cli/cms/data/file.js b/src/cli/cms/data/file.js
@@ -20,13 +20,14 @@ export function getAllWithKeys(withKeys) {
 
     if(json.abe_meta.latest.date != null) {
       file.date = json.abe_meta.latest.date
+      file.cleanDate = moment(json.abe_meta.latest.date).format('YYYY/MM/DD HH:MM:ss')
     }
 
     if(json.abe_meta != null) {
       var date = null
-      if (json.abe_meta.latest.date != null) {
+      if (json.abe_meta.latest.date !== null) {
         date = json.abe_meta.latest.date
-      } else if (json.abe_meta.date != null) {
+      } else if (json.abe_meta.date !== null) {
         date = json.abe_meta.date
       }
       cleanFile.abe_meta = {

diff --git a/src/cli/cms/data/revision.js b/src/cli/cms/data/revision.js
@@ -178,25 +178,26 @@ export function getFilesMerged(files) {
   // return merged
   Array.prototype.forEach.call(Object.keys(merged), (key) => {
     var revisions = merged[key].revisions
+
     revisions.sort(coreUtils.sort.predicatBy('date', -1))
     if(revisions[0] != null) {
       merged[key].date = revisions[0].date
     }
-
     Array.prototype.forEach.call(revisions, (revision) => {
-
       var status = revision.abe_meta.status
-
-      if (status === 'publish') {
-        merged[key][status] = revision
-      }else {
-        merged[key][status] = {}
+      if(typeof merged[key][status] === 'undefined' || merged[key][status] === null) {
+        if (status === 'publish') {
+          merged[key][status] = revision
+        }else {
+          merged[key][status] = {}
+        }
+        merged[key][status].path = revision.path
+        merged[key][status].html = revision.html
+        merged[key][status].htmlPath = revision.htmlPath
+        merged[key][status].date = new Date(revision.date)
+        merged[key][status].cleanDate = revision.cleanDate
+        merged[key][status].link = revision.abe_meta.link
       }
-      merged[key][status].path = revision.path
-      merged[key][status].html = revision.html
-      merged[key][status].htmlPath = revision.htmlPath
-      merged[key][status].date = new Date(revision.date)
-      merged[key][status].link = revision.abe_meta.link
     })
 
     merged[key].revisions = revisions

diff --git a/src/cli/cms/editor/handlebars/listPage.js b/src/cli/cms/editor/handlebars/listPage.js
@@ -42,19 +42,19 @@ export default function listPage(file, index, text) {
   if(file.draft != null) {
     if((file.publish == null)
       || (file.publish && file.publish.date < file.draft.date)) {
-      workflow += `<a href="/abe/${file.abe_meta.template}?filePath=${file.draft.html}" class="label label-default label-draft">draft</a>`
+      workflow += `<a href="/abe/${file.abe_meta.template}?filePath=${file.draft.html}" class="label label-default label-draft" title="${file.draft.cleanDate}">draft</a>`
     }else {
-      workflow += `<a href="/abe/${file.abe_meta.template}?filePath=${file.draft.html}" class="hidden label label-default label-draft">draft</a>`
+      workflow += `<a href="/abe/${file.abe_meta.template}?filePath=${file.draft.html}" class="hidden label label-default label-draft" title="${file.draft.cleanDate}">draft</a>`
     }
   }else {
-    workflow += `<a href="/abe/${file.abe_meta.template}?filePath=${file.abe_meta.link}" class="hidden label label-default label-draft">draft</a>`
+    workflow += `<a href="/abe/${file.abe_meta.template}?filePath=${file.abe_meta.link}" class="hidden label label-default label-draft" title="${file.cleanDate}">draft</a>`
   }
 
   workflow += '</td>'
   workflow += '<td align="center" class="publish">'
 
   if (file.publish){
-    workflow += `<a href="/abe/${file.abe_meta.template}?filePath=${file.publish.html}" class="checkmark label-published">&#10004;</a>`
+    workflow += `<a href="/abe/${file.abe_meta.template}?filePath=${file.publish.html}" class="checkmark label-published" title="${file.publish.cleanDate}">&#10004;</a>`
   }
   workflow += '</td>'
 
@@ -67,7 +67,8 @@ export default function listPage(file, index, text) {
   if(file.publish != null) {
     res += `<a href="/unpublish/?filePath=${file.abe_meta.link}"
                title="${text.unpublish}"
-               class="icon" data-unpublish="true" data-text="${text.confirmUnpublish} ${file.abe_meta.link}">
+               class="icon" data-unpublish="true" data-text="${text.confirmUnpublish} ${file.abe_meta.link}"
+               title="unpublish">
               <span class="glyphicon glyphicon-eye-close"></span>
             </a>`
   }
@@ -76,7 +77,8 @@ export default function listPage(file, index, text) {
              title="${text.delete}"
              class="icon"
              data-delete="true"
-             data-text="${text.confirmDelete} ${file.abe_meta.link}">
+             data-text="${text.confirmDelete} ${file.abe_meta.link}"
+             title="remove">
             <span class="glyphicon glyphicon-trash"></span>
           </a>`