From 7f0ffb8b0a5d9245af673ae99f3e367bf523614c Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Mon, 22 Aug 2016 23:10:10 +0200
Subject: [PATCH] Fix invitation link on people search page
---
app/assets/javascripts/app/router.js | 15 +++++++++------
config/locales/diaspora/en.yml | 2 +-
features/desktop/invitations.feature | 11 +++++++++++
3 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/app/assets/javascripts/app/router.js b/app/assets/javascripts/app/router.js
index d7bb3042c3..160123505b 100644
--- a/app/assets/javascripts/app/router.js
+++ b/app/assets/javascripts/app/router.js
@@ -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");
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 117005596c..8d952a2986 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -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"
diff --git a/features/desktop/invitations.feature b/features/desktop/invitations.feature
index 0d7059bf9e..5aafd11dff 100644
--- a/features/desktop/invitations.feature
+++ b/features/desktop/invitations.feature
@@ -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
--
GitLab