dont all file from manager in homepage + rm duplicate truncate helper

abecms · Mar 29, 2017 · 23e357e · 23e357e
1 parent 21e587e
commit 23e357e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 44 deletions.
diff --git a/src/cli/cms/templates/handlebars/truncate.js b/src/cli/cms/templates/handlebars/truncate.js
diff --git a/src/cli/cms/templates/index.js b/src/cli/cms/templates/index.js
@@ -17,7 +17,6 @@ import notEmpty 	from './handlebars/notEmpty'
 import printJson 	from './handlebars/printJson'
 import translate 	from './handlebars/translate'
 import times 			from './handlebars/times'
-import truncate 	from './handlebars/truncate'
 import lowercase 	from './handlebars/lowercase'
 import uppercase 	from './handlebars/uppercase'
 import setVariable 	from './handlebars/setVariable'
@@ -48,7 +47,6 @@ Handlebars.registerHelper('notEmpty', 	notEmpty)
 Handlebars.registerHelper('printJson', 	printJson)
 Handlebars.registerHelper('i18nAbe', 		translate)
 Handlebars.registerHelper('times', 			times)
-Handlebars.registerHelper('truncate', 	truncate)
 Handlebars.registerHelper('lowercase', 	lowercase)
 Handlebars.registerHelper('uppercase', 	uppercase)
 Handlebars.registerHelper('setVariable', 	setVariable)
@@ -72,7 +70,6 @@ export {
 	ifIn,
 	isTrue,
 	eachGroup,
-	truncate,
 	lowercase,
 	uppercase,
 	setVariable,

diff --git a/src/server/routes/get-home.js b/src/server/routes/get-home.js
@@ -19,7 +19,7 @@ import {
  */
 var route = function(req, res, next) {
   var manager = {}
-  manager.home = {files: Manager.instance.getList(), publishedFiles : Manager.instance.getListWithStatusOnFolder('publish')}
+  manager.home = {files: []}
   manager.list = Manager.instance.getStructureAndTemplates()
   manager.config = JSON.stringify(config)
 
@@ -29,10 +29,12 @@ var route = function(req, res, next) {
   var template = null
   var fileName = null
   var folderPath = null
-  var percent = (manager.home.publishedFiles.length / manager.home.files.length * 100).toFixed(1)
+  var files = Manager.instance.getList()
+  var publishedFiles = Manager.instance.getListWithStatusOnFolder('publish')
+  var percent = (publishedFiles.length / files.length * 100).toFixed(1)
   var statistics = {
-    totalPage: manager.home.files.length,
-    totalPublishedPage: manager.home.publishedFiles.length,
+    totalPage: files.length,
+    totalPublishedPage: publishedFiles.length,
     percentPublishedPages: percent,
     svgCirclePercent: 629 * (percent/100)
   }

diff --git a/test/hbs-helpers.js b/test/hbs-helpers.js
@@ -38,29 +38,6 @@ describe("Helpers", function () {
             chai.expect(rendered).to.eql(expected);
         });
     });
-    describe("truncate", function () {
-        it('properly truncate string', function() {
-            var value = 'ThiS IS mY String',
-                length = 10,
-                rendered = Handlebars.helpers.truncate(value, length),
-                expected = 'ThiS IS mY...';
-            chai.expect(rendered).to.eql(expected);
-        });
-        it('properly return full string', function() {
-            var value = 'ThiS IS mY String',
-                length = 20,
-                rendered = Handlebars.helpers.truncate(value, length),
-                expected = 'ThiS IS mY String';
-            chai.expect(rendered).to.eql(expected);
-        });
-        it('properly return empty string', function() {
-            var value = null,
-                length = 10,
-                rendered = Handlebars.helpers.truncate(value, length),
-                expected = '';
-            chai.expect(rendered).to.eql(expected);
-        });
-    });
     describe("isTrue", function () {
         it('properly eval ==', function() {
             var value1 = 'str1',