diff --git a/Changelog.md b/Changelog.md index 1fd404c29..54e8571d8 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ ## Bug fixes * Fix path to `bundle` in `script/server` [#7281](https://github.com/diaspora/diaspora/pull/7281) * Update comment in database example config [#7282](https://github.com/diaspora/diaspora/pull/7282) +* Make the \#newhere post public again [#7311](https://github.com/diaspora/diaspora/pull/7311) ## Features * Add support for [Liberapay](https://liberapay.com) donations [#7290](https://github.com/diaspora/diaspora/pull/7290) diff --git a/app/helpers/interim_stream_hackiness_helper.rb b/app/helpers/interim_stream_hackiness_helper.rb index 78a893143..b531871f2 100644 --- a/app/helpers/interim_stream_hackiness_helper.rb +++ b/app/helpers/interim_stream_hackiness_helper.rb @@ -38,12 +38,4 @@ module InterimStreamHackinessHelper [] end end - - def publisher_method(method) - @stream.try(:publisher).try(method) == true - end - - def publisher_open - publisher_method(:open) - end end diff --git a/app/helpers/publisher_helper.rb b/app/helpers/publisher_helper.rb index ed6ed9a48..472f29685 100644 --- a/app/helpers/publisher_helper.rb +++ b/app/helpers/publisher_helper.rb @@ -3,24 +3,18 @@ # the COPYRIGHT file. module PublisherHelper - def remote? - params[:controller] != "tags" - end - def service_button(service) - provider_title = I18n.t( - "services.index.share_to", - provider: service.provider.titleize) + provider_title = I18n.t("services.index.share_to", provider: service.provider.titleize) content_tag :div, class: "btn btn-link service_icon dim", title: "#{provider_title} (#{service.nickname})", - id: "#{service.provider}", - maxchar: "#{service.class::MAX_CHARACTERS}", + id: service.provider, + maxchar: service.class::MAX_CHARACTERS, data: {toggle: "tooltip", placement: "bottom"} do if service.provider == "wordpress" content_tag(:span, "", class: "social-media-logos-wordpress-16x16") else - content_tag(:i, "", class: "entypo-social-#{ service.provider } small") + content_tag(:i, "", class: "entypo-social-#{service.provider} small") end end end @@ -37,6 +31,10 @@ module PublisherHelper selected_aspects.include?(aspect) && !all_aspects_selected?(selected_aspects) && !public_selected?(selected_aspects) end + def publisher_open? + publisher_boolean?(:open) + end + private def publisher_boolean?(option) diff --git a/app/views/publisher/_publisher.html.haml b/app/views/publisher/_publisher.html.haml index 9c9370b0c..1304283a4 100644 --- a/app/views/publisher/_publisher.html.haml +++ b/app/views/publisher/_publisher.html.haml @@ -1,4 +1,4 @@ -.row.publisher#publisher{class: ((aspect == :profile || publisher_open) ? "mention_popup" : "closed")} +.row.publisher#publisher{class: ((aspect == :profile || publisher_open?) ? "mention_popup" : "closed")} .content_creation = form_for(StatusMessage.new) do |status| = status.error_messages