Skip to content

Commit

Permalink
Merge pull request #774 from plone/thet-1734-cleanup
Browse files Browse the repository at this point in the history
Cleanup of PLIP #1734
  • Loading branch information
thet authored Jun 14, 2017
2 parents 259079a + c260d8c commit 07ffa6d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion mockup/patterns/structure/js/views/tablerow.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ define([
data.portal_type = data.portal_type ? data.portal_type : '';
data.contenttype = data.portal_type.toLowerCase().replace(/\.| /g, '-');
data._authenticator = utils.getAuthenticator();
data.thumbSize = self.app.thumbSize;
data.thumb_scale = self.app.thumb_scale;

var viewAction = self.app.typeToViewAction && self.app.typeToViewAction[data.attributes.portal_type] || '';
data.viewURL = data.attributes.getURL + viewAction;
Expand Down
4 changes: 2 additions & 2 deletions mockup/patterns/structure/templates/tablerow.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
</p>
<% } %>
</div>
<% if(attributes["getIcon"] && ( thumbSize != 'none') ){ %>
<img class="image-<%- thumbSize %> pull-right" src="<%- getURL %>/@@images/image/<%- thumbSize %>">
<% if(attributes["getIcon"] && ( thumb_scale != 'none') ){ %>
<img class="image-<%- thumb_scale %> pull-right" src="<%- getURL %>/@@images/image/<%- thumb_scale %>">
<% } %>
</td>

Expand Down
2 changes: 1 addition & 1 deletion mockup/tests/pattern-structure-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ define([
});

it('should display an icon for contents with images', function() {
this.app.thumbSize = 'tile';
this.app.thumb_scale = 'tile';

var model = new Result({
'Title': "Dummy Document",
Expand Down

0 comments on commit 07ffa6d

Please sign in to comment.