Commit 289753e0 authored by Benjamin Neff's avatar Benjamin Neff Committed by Dennis Schubert

add "original post deleted" message on single post view

closes #5968
parent cde9b244
......@@ -10,6 +10,7 @@
* Remove some old temporary workarounds [#5964](https://github.com/diaspora/diaspora/pull/5964)
* Remove unused `hasPhotos` and `hasText` functions [#5969](https://github.com/diaspora/diaspora/pull/5969)
* Replace foreman with eye [#5966](https://github.com/diaspora/diaspora/pull/5966)
* Improved handling of reshares with deleted roots [#5968](https://github.com/diaspora/diaspora/pull/5968)
## Bug fixes
* Disable auto follow back on aspect deletion [#5846](https://github.com/diaspora/diaspora/pull/5846)
......
......@@ -10,7 +10,8 @@ app.views.Content = app.views.Base.extend({
text : app.helpers.textFormatter(this.model.get("text"), this.model.get("mentioned_people")),
largePhoto : this.largePhoto(),
smallPhotos : this.smallPhotos(),
location: this.location()
location: this.location(),
isReshare : this.model.get("post_type") === "Reshare"
});
},
......
......@@ -98,6 +98,11 @@
padding-top: 20px;
width: auto;
#real-post-content div.reshare {
border-left: 2px solid #DDD;
padding-left: 10px;
}
.oembed { width: 95%; }
.photo_attachments {
img.big_stream_photo { max-width: 90%; }
......
......@@ -16,7 +16,15 @@
<div class="collapsible">
<div class="markdown-content">
{{{text}}}
{{#if text}}
{{{text}}}
{{else if isReshare}}
<div class="reshare">
<p>
{{t "stream.original_post_deleted"}}
</p>
</div>
{{/if}}
</div>
<div class="oembed"></div>
<div class="opengraph"></div>
......
......@@ -10,4 +10,19 @@ describe("app.views.Content", function(){
expect(this.view.smallPhotos().length).toEqual(1);
});
});
describe("presenter", function(){
beforeEach(function(){
this.post.set({text : ""}); // for textFormatter
});
it("provides isReshare", function(){
expect(this.view.presenter().isReshare).toBeFalsy();
});
it("provides isReshare and be true when the post is a reshare", function(){
this.post.set({post_type : "Reshare"});
expect(this.view.presenter().isReshare).toBeTruthy();
});
});
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment