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

Hide "Follow #tag" button on tag page if not logged in

Browse source 
closes #7155
This commit is contained in:
Benjamin Neff 2016-10-22 17:47:26 +02:00 committed by Steffen van Bergerem
parent 1f05728033
commit ac08e9351b
No known key found for this signature in database
GPG key ID: 315C9787D548DC6B
3 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -33,6 +33,7 @@ Note: Although this is a minor release, the configuration file changed because t
* Fix duplicate flash message on mobile profile edit [#7107](https://github.com/diaspora/diaspora/pull/7107) * Fix duplicate flash message on mobile profile edit [#7107](https://github.com/diaspora/diaspora/pull/7107)
* Clicking photos on mobile should no longer cause 404s [#7071](https://github.com/diaspora/diaspora/pull/7071) * Clicking photos on mobile should no longer cause 404s [#7071](https://github.com/diaspora/diaspora/pull/7071)
* Fix avatar size on mobile privacy page for ignored people [#7148](https://github.com/diaspora/diaspora/pull/7148) * Fix avatar size on mobile privacy page for ignored people [#7148](https://github.com/diaspora/diaspora/pull/7148)
* Don't display tag following button when logged out [#7155](https://github.com/diaspora/diaspora/pull/7155)
## Features ## Features
* Deleted comments will be removed when loading more comments [#7045](https://github.com/diaspora/diaspora/pull/7045) * Deleted comments will be removed when loading more comments [#7045](https://github.com/diaspora/diaspora/pull/7045)

2
app/assets/javascripts/app/router.js
View file

@ -113,10 +113,12 @@ app.Router = Backbone.Router.extend({
app.tagFollowings.reset(gon.preloads.tagFollowings); app.tagFollowings.reset(gon.preloads.tagFollowings);
if (name) { if (name) {
if (app.currentUser.authenticated()) {
var followedTagsAction = new app.views.TagFollowingAction( var followedTagsAction = new app.views.TagFollowingAction(
{tagText: decodeURIComponent(name).toLowerCase()} {tagText: decodeURIComponent(name).toLowerCase()}
); );
$("#author_info").prepend(followedTagsAction.render().el); $("#author_info").prepend(followedTagsAction.render().el);
}
app.tags = new app.views.Tags({hashtagName: name}); app.tags = new app.views.Tags({hashtagName: name});
} }
this._hideInactiveStreamLists(); this._hideInactiveStreamLists();

10
spec/javascripts/app/router_spec.js
View file

@ -26,6 +26,16 @@ describe('app.Router', function () {
expect(followed_tags).toHaveBeenCalled(); expect(followed_tags).toHaveBeenCalled();
expect(tag_following_action).toHaveBeenCalledWith({tagText: 'somethingwithcapitalletters'}); expect(tag_following_action).toHaveBeenCalledWith({tagText: 'somethingwithcapitalletters'});
}); });
it("does not add the TagFollowingAction if not logged in", function() {
var followedTags = spyOn(app.router, "followed_tags").and.callThrough();
var tagFollowingAction = spyOn(app.views, "TagFollowingAction");
logout();
app.router.followed_tags("some_tag");
expect(followedTags).toHaveBeenCalled();
expect(tagFollowingAction).not.toHaveBeenCalled();
});
}); });
describe("when routing to /stream and hiding inactive stream lists", function() { describe("when routing to /stream and hiding inactive stream lists", function() {