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

Fix invitation link on people search page

Browse source
This commit is contained in:
Steffen van Bergerem 2016-08-22 23:10:10 +02:00 committed by Dennis Schubert
parent ae2cecefae
commit 7f0ffb8b0a
No known key found for this signature in database
GPG key ID: 5A0304BEA7966D7E
3 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,7 +18,7 @@ app.Router = Backbone.Router.extend({
"mentions(/)": "stream",
"notifications(/)": "notifications",
"p/:id(/)": "singlePost",
"people(/)": "pageWithAspectMembershipDropdowns",
"people(/)": "peopleSearch",
"people/:id(/)": "profile",
"people/:id/contacts(/)": "profile",
"people/:id/photos(/)": "photos",
@ -137,6 +137,14 @@ app.Router = Backbone.Router.extend({
new app.views.Notifications({el: "#notifications_container"});
},
peopleSearch: function() {
this._loadContacts();
this.renderAspectMembershipDropdowns($(document));
$(".invitations-link").click(function() {
app.helpers.showModal("#invitationsModal");
});
},
photos: function(guid) {
this._loadContacts();
this.renderPage(function() {
@ -214,11 +222,6 @@ app.Router = Backbone.Router.extend({
app.contacts = new app.collections.Contacts(app.parsePreload("contacts"));
},
pageWithAspectMembershipDropdowns: function() {
this._loadContacts();
this.renderAspectMembershipDropdowns($(document));
},
renderAspectMembershipDropdowns: function($context) {
$context.find(".aspect_membership_dropdown.placeholder").each(function() {
var personId = $(this).data("personId");

2
config/locales/diaspora/en.yml
View file

@ -1044,7 +1044,7 @@ en:
invitations:
invites: "Invites"
invite_your_friends: "Invite your friends"
by_email: "By email"
by_email: "Invite people by email"
share_this: "Share this link via email, blog, or social networks!"
public_explain:
control_your_audience: "Control your audience"

11
features/desktop/invitations.feature
View file

@ -48,3 +48,14 @@ Feature: Invitations
And I press "Send an invitation"
Then I should have 1 Devise email delivery
And I should not see "change your notification settings" in the last sent email
Scenario: sends an invitation from the people search page
When I sign in as "alice@alice.alice"
And I search for "test"
Then I should see "Users matching test" within "#search_title"
When I click on selector "#invitations-button"
And I fill in the following:
| email_inviter_emails | alex@example.com |
And I press "Send an invitation"
Then I should have 1 Devise email delivery
And I should not see "change your notification settings" in the last sent email