parent
526ebcfa13
commit
b3e3de08b8
3 changed files with 8 additions and 4 deletions
|
|
@ -6,6 +6,7 @@
|
|||
* Use empty selector where "#" was used as a selector before (prepare jQuery 3 upgrade) [#7372](https://github.com/diaspora/diaspora/pull/7372)
|
||||
|
||||
## Bug fixes
|
||||
* Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379)
|
||||
|
||||
## Features
|
||||
|
||||
|
|
|
|||
|
|
@ -28,9 +28,11 @@ app.views.StreamPost = app.views.Post.extend({
|
|||
".permalink"].join(", "),
|
||||
|
||||
initialize : function(){
|
||||
// If we are on a user page, we don't want to remove posts on block
|
||||
if (!app.page.model.has("profile")) {
|
||||
var personId = this.model.get("author").id;
|
||||
app.events.on("person:block:"+personId, this.remove, this);
|
||||
|
||||
app.events.on("person:block:" + personId, this.remove, this);
|
||||
}
|
||||
this.model.on("remove", this.remove, this);
|
||||
//subviews
|
||||
this.commentStreamView = new app.views.CommentStream({model : this.model});
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ Feature: Blocking a user from the stream
|
|||
Scenario: Blocking a user from the profile page
|
||||
When I am on "alice@alice.alice"'s page
|
||||
And I confirm the alert after I click on the profile block button
|
||||
Then "All your base are belong to us!" should be post 1
|
||||
Then I should see "Stop ignoring" within "#unblock_user_button"
|
||||
And "All your base are belong to us!" should be post 1
|
||||
When I go to the home page
|
||||
Then I should not see any posts in my stream
|
||||
|
|
|
|||
Loading…
Reference in a new issue