Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not show the service to the user if it is disabled, fixes #6184 #8406

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/helpers/publisher_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
# the COPYRIGHT file.

module PublisherHelper
def display_available_services
current_user.services.each do |service|
return service_button(service) if AppConfig.configured_services.map(&:to_s).include? service.provider
end
end

def service_button(service)
provider_title = I18n.t("services.index.share_to", provider: service.provider.titleize)
content_tag :div,
Expand Down
5 changes: 2 additions & 3 deletions app/views/publisher/_publisher.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,8 @@
%button.btn.btn-group.btn-primary#submit= t("shared.publisher.share")

.btn-toolbar.pull-right#publisher-service-icons
- if current_user.services
- current_user.services.each do |service|
= service_button(service)
= display_available_services

.btn.btn-link.question_mark{title: t("shared.public_explain.manage"),
data: {toggle: "modal", target: "#publicExplainModal"}}
%i.entypo-cog
Expand Down
8 changes: 2 additions & 6 deletions app/views/publisher/_publisher.mobile.haml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@

= hidden_field_tag "aspect_ids[]", "all_aspects"
.form-group
%span#publisher-service-icons
- if current_user.services
- for service in current_user.services
= image_tag "social-media-logos/#{service.provider}-32x32.png",
title: service.provider.titleize, class: "service_icon dim",
id: "#{service.provider}", maxchar: "#{service.class::MAX_CHARACTERS}"

.clear
#publisher-textarea-wrapper
Expand All @@ -32,3 +26,5 @@
data: {"disable-with" => t("shared.publisher.posting")}
.pull-right
= render partial: "aspects/aspect_dropdown"
.pull-right#publisher-service-icons
= display_available_services
4 changes: 4 additions & 0 deletions config/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -202,5 +202,9 @@ test:
enable: true
key: 'fake'
secret: 'sdoigjosdfijg'
tumblr:
enable: true
key: 'fake'
secret: 'sdoigjosdfijg'
mail:
enable: true