Merge pull request #19 from clash82/revert-17-alfa4

Revert "EZP-24659: Replace `outputtype` parameter with `outputtypeid`
ezsystems · Jul 30, 2015 · c6b5ac8 · c6b5ac8
2 parents 2161cba + 1c178a4
commit c6b5ac8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Resources/public/js/recommendationrestclient.js b/Resources/public/js/recommendationrestclient.js
@@ -20,7 +20,7 @@
         this.language = config.language || '';
         this.fields = config.fields || [];
         this.contentType = config.contentType || '';
-        this.outputTypeId = config.outputTypeId || '';
+        this.outputType = config.outputType || '';
         this.contextItems = config.contextItems || '';
         this.categoryPath = config.categoryPath || '';
         this.errorMessage = config.errorMessage || 'Error occurred while loading recommendations';
@@ -70,7 +70,7 @@
             '.json?numrecs=', this.limit,
             '&contextitems=', this.contextItems,
             '&contenttype=', this.contentType,
-            '&outputtypeid=', this.outputTypeId,
+            '&outputtype=', this.outputType,
             '&categorypath=', encodeURIComponent(this.categoryPath),
             '&lang=', this.language,
             attributes

diff --git a/Resources/public/views/show_recommendations.html.twig b/Resources/public/views/show_recommendations.html.twig
@@ -12,7 +12,7 @@
                     endpointUrl: '{{ endpointUrl }}',
                     language: '{{ language }}',
                     contentType: '{{ contentType }}',
-                    outputTypeId: '{{ outputTypeId }}',
+                    outputType: '{{ outputType }}',
                     contextItems: '{{ contentId }}',
                     categoryPath: '{{ categoryPath }}',
                     fields: [{% for entry in fields %}'{{ entry }}', {% endfor %}],

diff --git a/Twig/RecommendationTwigExtension.php b/Twig/RecommendationTwigExtension.php
@@ -240,7 +240,7 @@ public function showRecommendations(
                 'endpointUrl' => $this->getEndPointUrl(),
                 'feedbackUrl' => $this->getFeedbackUrl($this->getContentTypeId($contentType)),
                 'contentType' => $this->getContentTypeId($this->getContentIdentifier($contentId)),
-                'outputTypeId' => $this->getContentTypeId($contentType),
+                'outputType' => $this->getContentTypeId($contentType),
                 'categoryPath' => $this->getLocationPathString($contentId)
             )
         );