Unverified Commit bb282684 authored by Steffen van Bergerem's avatar Steffen van Bergerem Committed by Benjamin Neff
Browse files

Only display invite link on contacts page if invitations are enabled 

fixes #7340

closes #7342
parent 0627cdaf

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
* Make the \#newhere post public again [#7311](https://github.com/diaspora/diaspora/pull/7311)

* Remove whitespace from author link [#7330](https://github.com/diaspora/diaspora/pull/7330)

* Fix autosize in modals [#7339](https://github.com/diaspora/diaspora/pull/7339)

* Only display invite link on contacts page if invitations are enabled [#7342](https://github.com/diaspora/diaspora/pull/7342)



## Features

* Add support for [Liberapay](https://liberapay.com) donations [#7290](https://github.com/diaspora/diaspora/pull/7290)

app/views/contacts/_sidebar.html.haml

+15 −11
Original line number Diff line number Diff line
@@ -2,12 +2,16 @@ 
  %h3

    = t("contacts.index.title")

= render "contacts/aspect_listings"

- if AppConfig.settings.community_spotlight.enable? || AppConfig.settings.invitations.open?

  %hr

  - if AppConfig.settings.community_spotlight.enable?

    .text-center.spotlight

    = link_to t("contacts.spotlight.community_spotlight"), community_spotlight_path, class: "btn btn-link"

      = link_to t("contacts.spotlight.community_spotlight"),

          community_spotlight_path,

          class: "btn btn-link"

  - if AppConfig.settings.invitations.open?

    .text-center

  #invitations-button.btn.btn-link{ "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,