diff --git a/app/models/app_config.rb b/app/models/app_config.rb index 338036002..7786c166c 100644 --- a/app/models/app_config.rb +++ b/app/models/app_config.rb @@ -95,13 +95,13 @@ HELP def self.normalize_pod_services if defined?(SERVICES) - connected_services = [] + configured_services = [] SERVICES.keys.each do |service| unless SERVICES[service].keys.any?{|service_key| SERVICES[service][service_key].blank?} - connected_services << service + configured_services << service end end - self['configured_services'] = connected_services + self['configured_services'] = configured_services end end diff --git a/app/views/shared/_invitations.haml b/app/views/shared/_invitations.haml index a2ef56239..d3a726009 100644 --- a/app/views/shared/_invitations.haml +++ b/app/views/shared/_invitations.haml @@ -1,13 +1,10 @@ -if AppConfig[:open_invitations] - - if SERVICES['facebook']['app_id'] !="" + - if AppConfig.configured_services.include?('facebook') - if defined? remote = link_to t('.from_facebook'), friend_finder_path('facebook', :remote => remote), :rel => 'facebox' -else = link_to t('.from_facebook'), friend_finder_path('facebook'), :rel => 'facebox' %br - - = link_to t('.by_email'), new_user_invitation_path, :title => t('.invite_someone'), :rel => 'facebox' - - else - = link_to t('.by_email'), new_user_invitation_path, :title => t('.invite_someone'), :rel => 'facebox' + = link_to t('.by_email'), new_user_invitation_path, :title => t('.invite_someone'), :rel => 'facebox' - else = t('.dont_have_now')