Merge pull request TryGhost#6242 from halfdan/6205-last-limit

Fix broken @last for foreach with limit
ErisDS · Dec 20, 2015 · 9683492 · 9683492
2 parents fe91944 + 3b235b9
commit 9683492
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/core/server/helpers/foreach.js b/core/server/helpers/foreach.js
@@ -18,7 +18,7 @@ foreach = function (context, options) {
         inverse = options.inverse,
         columns = options.hash.columns,
         length = _.size(context),
-        limit = options.hash.limit || length,
+        limit = parseInt(options.hash.limit, 10) || length,
         output = '',
         data,
         contextPath;
@@ -63,7 +63,7 @@ foreach = function (context, options) {
 
         _.each(context, function (item, key) {
             if (count <= limit) {
-                execIteration(key, count - 1, count === length);
+                execIteration(key, count - 1, count === limit);
             }
             count += 1;
         });

diff --git a/core/test/unit/server_helpers/foreach_spec.js b/core/test/unit/server_helpers/foreach_spec.js
@@ -355,6 +355,14 @@ describe('{{#foreach}} helper', function () {
             shouldCompileToExpected(templateString, objectHash2, expected);
         });
 
+        it('@last in foreach with limit', function () {
+            var templateString = '{{#foreach goodbyes limit="2"}}{{#if @last}}{{text}}! {{/if}}{{/foreach}}cruel {{world}}!',
+                expected = 'Goodbye! cruel world!';
+
+            shouldCompileToExpected(templateString, arrayHash2, expected);
+            shouldCompileToExpected(templateString, objectHash2, expected);
+        });
+
         it('foreach with limit 1', function () {
             var templateString = '<ul>{{#foreach posts limit="1"}}<li>{{title}}</li>{{else}}not this{{/foreach}}</ul>',
                 expected = '<ul><li>first</li></ul>';