Skip to content
Extraits de code Groupes Projets
Valider 309e690a rédigé par Jason Robinson's avatar Jason Robinson
Parcourir les fichiers

Fix services in statistics.json.

Currently there is a bug in configurate that reports incorrectly the services settings if they are set as ENV variables, instead of diaspora.yml settings.
This commit works around that issue by changing the way the setting is fetched.
parent 1959f0d9
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -51,6 +51,7 @@ The default for including jQuery from a CDN has changed. If you want to continue
* Fix deformed getting started popover [#5227](https://github.com/diaspora/diaspora/pull/5227)
* Use correct locale for invitation subject [#5232](https://github.com/diaspora/diaspora/pull/5232)
* Initial support for IDN emails
* Fix services settings reported by statistics.json [#5256](https://github.com/diaspora/diaspora/pull/5256)
## Features
* Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)
......
......@@ -17,10 +17,8 @@ class StatisticsPresenter
if AppConfig.privacy.statistics.comment_counts?
result['local_comments'] = self.local_comments
end
AppConfig.services.each do |service, options|
result[service] = options ? !!options["enable"] : false
result[service] = AppConfig["services.#{service}.enable"]
end
result
......
......@@ -18,12 +18,14 @@ describe StatisticsPresenter do
AppConfig.privacy.statistics.user_counts = false
AppConfig.privacy.statistics.post_counts = false
AppConfig.privacy.statistics.comment_counts = false
AppConfig.services = {"facebook" => nil}
expect(@presenter.as_json).to eq({
"name" => AppConfig.settings.pod_name,
"version" => AppConfig.version_string,
"registrations_open" => AppConfig.settings.enable_registrations,
"facebook" => false
"facebook" => true,
"twitter" => false,
"tumblr" => false,
"wordpress" => false,
})
end
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter