Skip to content

Commit

Permalink
Merge pull request #19 from clash82/revert-17-alfa4
Browse files Browse the repository at this point in the history
Revert "EZP-24659: Replace `outputtype` parameter with `outputtypeid`
  • Loading branch information
lserwatka committed Jul 30, 2015
2 parents 2161cba + 1c178a4 commit c6b5ac8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Resources/public/js/recommendationrestclient.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Resources/public/views/show_recommendations.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}],
Expand Down
2 changes: 1 addition & 1 deletion Twig/RecommendationTwigExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
);
Expand Down

0 comments on commit c6b5ac8

Please sign in to comment.