nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix block user failing feature

Browse source 
closes #7379
This commit is contained in:
flaburgan 2017-03-21 00:38:08 +01:00 committed by Steffen van Bergerem
parent 526ebcfa13
commit b3e3de08b8
No known key found for this signature in database
GPG key ID: 315C9787D548DC6B
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -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) * Use empty selector where "#" was used as a selector before (prepare jQuery 3 upgrade) [#7372](https://github.com/diaspora/diaspora/pull/7372)
## Bug fixes ## Bug fixes
* Don't hide posts when blocking someone from the profile [#7379](https://github.com/diaspora/diaspora/pull/7379)
## Features ## Features

8
app/assets/javascripts/app/views/stream_post_views.js
View file

@ -28,9 +28,11 @@ app.views.StreamPost = app.views.Post.extend({
".permalink"].join(", "), ".permalink"].join(", "),
initialize : function(){ initialize : function(){
var personId = this.model.get("author").id; // If we are on a user page, we don't want to remove posts on block
app.events.on("person:block:"+personId, this.remove, this); if (!app.page.model.has("profile")) {
var personId = this.model.get("author").id;
app.events.on("person:block:" + personId, this.remove, this);
}
this.model.on("remove", this.remove, this); this.model.on("remove", this.remove, this);
//subviews //subviews
this.commentStreamView = new app.views.CommentStream({model : this.model}); this.commentStreamView = new app.views.CommentStream({model : this.model});

3
features/desktop/blocks_user.feature
View file

@ -18,6 +18,7 @@ Feature: Blocking a user from the stream
Scenario: Blocking a user from the profile page Scenario: Blocking a user from the profile page
When I am on "alice@alice.alice"'s page When I am on "alice@alice.alice"'s page
And I confirm the alert after I click on the profile block button 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 When I go to the home page
Then I should not see any posts in my stream Then I should not see any posts in my stream