refactoring: removing cleanNameNoExt from the code

abecms · Oct 30, 2016 · 527c72d · 527c72d
1 parent 00725d5
commit 527c72d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/src/cli/cms/data/file.js b/src/cli/cms/data/file.js
@@ -165,7 +165,6 @@ export function getFileObject(pathFile) {
   const extension = '.json'
 
   const name = path.basename(pathFile)
-  const nameNoExt = path.basename(pathFile, extension)
   const relativePath = pathFile.replace(pathData + '/', '')
 
   const parentName = cmsData.fileAttr.delete(name)
@@ -187,7 +186,6 @@ export function getFileObject(pathFile) {
 
   let fileObject = {
     'name': name,
-    'cleanNameNoExt': nameNoExt,
     'path': pathFile,
     'cleanPath': relativePath,
     'filePath': relativePath,

diff --git a/src/cli/cms/data/revision.js b/src/cli/cms/data/revision.js
@@ -163,7 +163,6 @@ export function getFilesMerged(files) {
         cleanPathName: file.cleanPathName,
         cleanPath: file.cleanPath,
         cleanName: file.cleanName,
-        cleanNameNoExt: file.cleanNameNoExt,
         cleanFilePath: file.cleanFilePath,
         filePath: cmsData.fileAttr.delete(file.filePath),
         revisions: []

diff --git a/src/cli/cms/templates/template.js b/src/cli/cms/templates/template.js
@@ -284,7 +284,7 @@ export function getStructureAndTemplates() {
     let additionalPath = path.dirname(templatePath).replace(pathTemplates,'')
     if(additionalPath !== '') additionalPath = additionalPath.substring(1)
     let name = path.join(additionalPath,path.basename(templatePath,extension))
-    let template = {'path':templatePath, 'cleanPath':templatePath, 'cleanNameNoExt':name}
+    let template = {'path':templatePath, 'cleanPath':templatePath, 'name':name}
     result.templates.push(template)
   })
 

diff --git a/src/server/views/partials/create-form-template.html b/src/server/views/partials/create-form-template.html
@@ -5,12 +5,12 @@
       <option></option>
       {{#each manager.list.templates}}
         {{#if isHome}}
-        <option value="{{cleanPath}}" clean-value="{{website}}">{{cleanNameNoExt}}</option>
+        <option value="{{cleanPath}}" clean-value="{{website}}">{{name}}</option>
         {{else}}
-          {{#ifCond @root.json.abe_meta.template cleanNameNoExt}}
-          <option value="{{cleanPath}}" clean-value="{{website}}" selected="selected">{{cleanNameNoExt}}</option>
+          {{#ifCond @root.json.abe_meta.template name}}
+          <option value="{{cleanPath}}" clean-value="{{website}}" selected="selected">{{name}}</option>
           {{else}}
-          <option value="{{cleanPath}}" clean-value="{{website}}">{{cleanNameNoExt}}</option>
+          <option value="{{cleanPath}}" clean-value="{{website}}">{{name}}</option>
           {{/ifCond}}
         {{/if}}
       {{/each}}