diff --git a/Changelog.md b/Changelog.md index e9156b2b7..b6f396350 100644 --- a/Changelog.md +++ b/Changelog.md @@ -12,6 +12,7 @@ ## Bug fixes * Fix notifications when people remove their birthday date [#7691](https://github.com/diaspora/diaspora/pull/7691) +* Fix invite link on the contacts page when the user has now contacts [#7690](https://github.com/diaspora/diaspora/pull/7690) ## Features * Check if redis is running in script/server [#7685](https://github.com/diaspora/diaspora/pull/7685) diff --git a/app/assets/javascripts/app/pages/contacts.js b/app/assets/javascripts/app/pages/contacts.js index 01edab466..9f7b27311 100644 --- a/app/assets/javascripts/app/pages/contacts.js +++ b/app/assets/javascripts/app/pages/contacts.js @@ -9,7 +9,7 @@ app.pages.Contacts = Backbone.View.extend({ "click #chat_privilege_toggle" : "toggleChatPrivilege", "click #change_aspect_name" : "showAspectNameForm", "click .conversation_button": "showMessageModal", - "click #invitations-button": "showInvitationsModal" + "click .invitations-button": "showInvitationsModal" }, initialize: function(opts) { diff --git a/app/assets/javascripts/app/router.js b/app/assets/javascripts/app/router.js index 905693b99..702edc903 100644 --- a/app/assets/javascripts/app/router.js +++ b/app/assets/javascripts/app/router.js @@ -186,7 +186,7 @@ app.Router = Backbone.Router.extend({ }, spotlight: function() { - $("#invitations-button").click(function() { + $(".invitations-button").click(function() { app.helpers.showModal("#invitationsModal"); }); }, diff --git a/app/assets/stylesheets/people.scss b/app/assets/stylesheets/people.scss index 65a9100ae..2283f8066 100644 --- a/app/assets/stylesheets/people.scss +++ b/app/assets/stylesheets/people.scss @@ -3,7 +3,7 @@ .term { font-weight: 700; } small { margin-left: 15px; } } - #invitations-button { padding-left: 0; } + .invitations-button { padding-left: 0; } } #people-stream { .media, .media-body { diff --git a/app/views/contacts/_sidebar.html.haml b/app/views/contacts/_sidebar.html.haml index 111097bab..a3a637520 100644 --- a/app/views/contacts/_sidebar.html.haml +++ b/app/views/contacts/_sidebar.html.haml @@ -11,7 +11,7 @@ class: "btn btn-link" - if AppConfig.settings.invitations.open? .text-center - .btn.btn-link#invitations-button{"data-toggle" => "modal"} + .btn.btn-link.invitations-button{"data-toggle" => "modal"} = t("invitations.new.invite_someone_to_join") = render "shared/modal", path: new_user_invitation_path, diff --git a/app/views/contacts/index.html.haml b/app/views/contacts/index.html.haml index 217f61c5d..dd81e56fb 100644 --- a/app/views/contacts/index.html.haml +++ b/app/views/contacts/index.html.haml @@ -27,7 +27,7 @@ != t(".no_contacts_message", community_spotlight: link_to(t(".community_spotlight"), community_spotlight_path)) %p - .btn.btn-link{"data-toggle" => "modal"} + .btn.btn-link.invitations-button{"data-toggle" => "modal"} = t("invitations.new.invite_someone_to_join") #paginate diff --git a/app/views/shared/_invitations.haml b/app/views/shared/_invitations.haml index b69a18c73..55445bc04 100644 --- a/app/views/shared/_invitations.haml +++ b/app/views/shared/_invitations.haml @@ -2,7 +2,7 @@ = invite_link(current_user.invitation_code) - if AppConfig.mail.enable? - .invitations-link.btn.btn-link#invitations-button{"data-toggle" => "modal"} + .invitations-link.btn.btn-link.invitations-button{"data-toggle" => "modal"} = t(".by_email") - content_for :after_content do diff --git a/features/desktop/invitations.feature b/features/desktop/invitations.feature index f01e194e3..75a5758ed 100644 --- a/features/desktop/invitations.feature +++ b/features/desktop/invitations.feature @@ -36,13 +36,13 @@ Feature: Invitations And I log out And I sign in as "alice@alice.alice" And I click on "Invite your friends" navbar title - And I click on selector "#invitations-button" + And I click on selector ".invitations-button" Then I should see one less invite Scenario: sends an invitation from the sidebar When I sign in as "alice@alice.alice" And I click on "Invite your friends" navbar title - And I click on selector "#invitations-button" + And I click on selector ".invitations-button" And I fill in the following: | email_inviter_emails | alex@example.com | And I press "Send an invitation" @@ -67,7 +67,7 @@ Feature: Invitations 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" + 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"