Issue #11 fix gogo_taxonomy

pixelhumain · Oct 22, 2018 · 0c9815b · 0c9815b
1 parent 997af00
commit 0c9815b
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 23 deletions.
diff --git a/src/js/classes/element/element-base.class.ts b/src/js/classes/element/element-base.class.ts
@@ -100,6 +100,14 @@ export class ElementBase
     return optionTree.children[0].children[0].children;
   }
 
+  gogo_taxonomy() : CategoryValue[]
+  {
+    if (this.status == ElementStatus.PendingModification && this.modifiedElement)  
+      return this.modifiedElement.getRootCategoriesValues();
+    else 
+      return this.getRootCategoriesValues();
+  }
+
   getOptionValueByCategoryId($categoryId)
   {
     return this.optionsValues.filter((oV) => oV.categoryOwner.id == $categoryId);

diff --git a/src/js/components/element/element.component.ts b/src/js/components/element/element.component.ts
@@ -31,12 +31,6 @@ export class ElementComponent
     this.element.updateDistance();
 
     let optionsToDisplay = this.element.getIconsToDisplay();
-
-    let rootCategoriesValues;
-    if (this.element.status == ElementStatus.PendingModification && this.element.modifiedElement)  
-      rootCategoriesValues = this.element.modifiedElement.getRootCategoriesValues();
-    else
-      rootCategoriesValues = this.element.getRootCategoriesValues();
 
     let options = {
       element : this.element, 
@@ -46,16 +40,15 @@ export class ElementComponent
       mainOptionToDisplay: optionsToDisplay[0], 
       otherOptionsToDisplay: optionsToDisplay.slice(1),  
       currOptionsValues: this.element.getCurrDeepestOptionsValues().filter( (oV) => oV.option.displayInInfoBar).sort( (a,b) => a.isFilledByFilters ? -1 : 1),      
-      rootCategoriesValues : rootCategoriesValues,
-      editUrl : App.config.features.edit.url + this.element.id,
+      editUrl: App.config.features.edit.url + this.element.id,
       ElementStatus: ElementStatus,
       ElementModerationState: ElementModerationState,
-      isIframe : App.isIframe,
-      isMapMode : App.mode == AppModes.Map,
-      config : App.config,
-      smallWidth : App.mode == AppModes.Map && App.infoBarComponent.isDisplayedAside(),
-      allowedStamps : App.stampModule.allowedStamps,
-      body : undefined
+      isIframe: App.isIframe,
+      isMapMode: App.mode == AppModes.Map,
+      config: App.config,
+      smallWidth: App.mode == AppModes.Map && App.infoBarComponent.isDisplayedAside(),
+      allowedStamps: App.stampModule.allowedStamps,
+      body: App.templateModule.elementTemplate.renderBody($.extend(this.element, { gogo_taxonomy: this.element.gogo_taxonomy()}))
     };    
 
     let html = App.templateModule.render('element', options);

diff --git a/src/js/modules/core/template.module.ts b/src/js/modules/core/template.module.ts
@@ -45,8 +45,6 @@ export class TemplateModule
 			default: console.warn('[GoGoCarto] No template associated to templateName', templateName);
 		}
 
-		if (templateName == 'element') options.body = this.elementTemplate.renderBody(options);
-
 		return this.nunjucksEnvironment.render(fileUrl, options);
 	}
 

diff --git a/src/js/modules/element/template-element.module.ts b/src/js/modules/element/template-element.module.ts
@@ -48,13 +48,14 @@ export class TemplateElementModule
   }  
 
   // If there is a body template configured, then we use it. We use the default body otherwise.
-  renderBody(options)
+  renderBody(element)
   {    
-    let renderedTemplate = ""
+    let renderedTemplate = "";
+    console.log("renderBody", element);
     if (this.bodyTemplate)
-      renderedTemplate = this.bodyTemplate.render(options.element);      
+      renderedTemplate = this.bodyTemplate.render(element);      
     else
-      renderedTemplate = App.templateModule.render('element-body-default', options);
+      renderedTemplate = App.templateModule.render('element-body-default', {element: element});
 
     return this.fixTemplate(renderedTemplate);
   }

diff --git a/src/views/components/element/body.html.njk b/src/views/components/element/body.html.njk
@@ -28,7 +28,7 @@
 {{ ''|gogo_separator }}
 
 {# Categories  #}
-{{ element.getProperty('rootCategoriesValues')|gogo_taxonomy }}
+{{ element.gogo_taxonomy|gogo_taxonomy }}
 
 {{ element.getProperty('tags')|gogo_tags}}
 

diff --git a/web/data/custom-template-simple.md b/web/data/custom-template-simple.md
@@ -1,16 +1,18 @@
 # Test template distant
 
-{{ name|gogourl }}
+{{ name|gogo_url }}
 blabla le petit text
 
 ## Test template distant
 
-{{ name|gogourl }}
+{{ name|gogo_url }}
 Encore du text h1 h5
 
 ### Test template distant
 {{ name }}
 
+{{ gogo_taxonomy|gogo_taxonomy }}
+
 ___
 
 **Address** : {{ address.formatedAddress }}