diff --git a/Changelog.md b/Changelog.md
index 7f65f6344..fb14d8ba4 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -36,6 +36,7 @@
* Fix empty page after authenticating with other services. [#3693](https://github.com/diaspora/diaspora/pull/3693)
* Fix posting public posts to Facebook. [#2882](https://github.com/diaspora/diaspora/issues/2882), [#3650](https://github.com/diaspora/diaspora/issues/3650)
* Fix error with invite link box shows on search results page even if invites have been turned off. [#3708](https://github.com/diaspora/diaspora/pull/3708)
+* Fix problem with show reshares_count in stream. [#3700](https://github.com/diaspora/diaspora/pull/3700)
# 0.0.1.2
diff --git a/app/assets/templates/reshare_tpl.jst.hbs b/app/assets/templates/reshare_tpl.jst.hbs
index 08e399050..c75f8f446 100644
--- a/app/assets/templates/reshare_tpl.jst.hbs
+++ b/app/assets/templates/reshare_tpl.jst.hbs
@@ -23,9 +23,9 @@
- {{#if reshares_count}}
+ {{#if interactions.reshares_count}}
-
- {{t "stream.reshares" count=reshares_count}}
+ {{t "stream.reshares" count=interactions.reshares_count}}
{{/if}}
diff --git a/app/assets/templates/stream-element_tpl.jst.hbs b/app/assets/templates/stream-element_tpl.jst.hbs
index ee002d145..c57305996 100644
--- a/app/assets/templates/stream-element_tpl.jst.hbs
+++ b/app/assets/templates/stream-element_tpl.jst.hbs
@@ -37,9 +37,9 @@
- {{#if reshares_count}}
+ {{#if interactions.reshares_count}}
-
- {{t "stream.reshares" count=reshares_count}}
+ {{t "stream.reshares" count=interactions.reshares_count}}
{{/if}}
diff --git a/spec/javascripts/app/views/stream_post_spec.js b/spec/javascripts/app/views/stream_post_spec.js
index dc75f5133..1f908b59c 100644
--- a/spec/javascripts/app/views/stream_post_spec.js
+++ b/spec/javascripts/app/views/stream_post_spec.js
@@ -28,19 +28,19 @@ describe("app.views.StreamPost", function(){
context("reshare", function(){
it("displays a reshare count", function(){
- this.statusMessage.set({reshares_count : 2})
+ this.statusMessage.set({ interactions: {reshares_count : 2 }});
var view = new this.PostViewClass({model : this.statusMessage}).render();
- expect($(view.el).html()).toContain(Diaspora.I18n.t('stream.reshares', {count: 2}))
- })
+ expect($(view.el).html()).toContain(Diaspora.I18n.t('stream.reshares', {count: 2}));
+ });
it("does not display a reshare count for 'zero'", function(){
- this.statusMessage.set({reshares_count : 0})
+ this.statusMessage.interactions.set({ interactions: { reshares_count : 0}} );
var view = new this.PostViewClass({model : this.statusMessage}).render();
- expect($(view.el).html()).not.toContain("0 Reshares")
- })
- })
+ expect($(view.el).html()).not.toContain("0 Reshares");
+ });
+ });
context("likes", function(){
it("displays a like count", function(){