correctly pass data to the template

selaux · Mar 9, 2014 · 6bdcedf · 6bdcedf
1 parent 6d3e63a
commit 6bdcedf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/View.js b/lib/View.js
@@ -23,19 +23,19 @@ View.prototype.getCompiledTemplate = function (templateName) {
 };
 
 View.prototype.render = function () {
-    return this.module.data ? this.renderViewWithData() : this.renderViewWithoutData();
+    return !_.isEmpty(this.module.attributes) ? this.renderViewWithData() : this.renderViewWithoutData();
 };
 
 View.prototype.getViewData = function () {
-    return { json: JSON.stringify(this.module.data) };
+    return { json: JSON.stringify(this.module.attributes) };
 };
 
 View.prototype.renderViewWithData = function () {
     return this.template(_.extend({
         id: this.module.id,
         title: this.module.title,
         lastUpdated: new Date()
-    }, this.module.data, this.getViewData()));
+    }, this.module.attributes, this.getViewData()));
 };
 
 View.prototype.renderViewWithoutData = function () {

diff --git a/test/specs/lib/View.js b/test/specs/lib/View.js
@@ -66,7 +66,7 @@ describe('View', function () {
                     id: 'foo',
                     template: 'json',
                     title: 'bar',
-                    data: { some: 'json', data: 'of', the: 'module' }
+                    attributes: { some: 'json', data: 'of', the: 'module' }
                 },
                 view = new View(module);
 
@@ -78,7 +78,7 @@ describe('View', function () {
             expect(view.template).to.have.been.calledWithMatch({
                 id: module.id,
                 title: module.title,
-                json: JSON.stringify(module.data),
+                json: JSON.stringify(module.attributes),
                 some: 'json',
                 data: 'of',
                 the: 'module'