diff --git a/framework/core/ember/app/controllers/discussions.js b/framework/core/ember/app/controllers/discussions.js index 2083083c6..1f8da14b0 100644 --- a/framework/core/ember/app/controllers/discussions.js +++ b/framework/core/ember/app/controllers/discussions.js @@ -108,9 +108,9 @@ export default Ember.ArrayController.extend(Ember.Evented, { var results = Em.A(); discussions.forEach(function(discussion) { var relevantPosts = Em.A(); - discussion.get('relevantPosts.content').forEach(function(post) { - relevantPosts.pushObject(PostResult.create(post)); - }); + // discussion.get('relevantPosts.content').forEach(function(post) { + // relevantPosts.pushObject(PostResult.create(post)); + // }); results.pushObject(DiscussionResult.create({ content: discussion, relevantPosts: relevantPosts, diff --git a/framework/core/ember/bower.json b/framework/core/ember/bower.json index e78561e86..44df035b4 100644 --- a/framework/core/ember/bower.json +++ b/framework/core/ember/bower.json @@ -4,7 +4,7 @@ "handlebars": "2.0.0", "jquery": "^1.11.1", "ember": "1.9.1", - "ember-data": "1.0.0-beta.12", + "ember-data": "1.0.0-beta.14", "ember-resolver": "~0.1.10", "loader.js": "stefanpenner/loader.js#1.0.1", "ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",