diff options
| author | Alex Nordlund <deep.alexander@gmail.com> | 2014-10-05 03:45:48 +0400 |
|---|---|---|
| committer | Alex Nordlund <deep.alexander@gmail.com> | 2014-10-05 03:45:48 +0400 |
| commit | acc7377e5f3b2b0df39d3d09ca8525ec38911d7e (patch) | |
| tree | a06bfb2eee89b50886dbf1b9e3d6bb6b6d2af25b | |
| parent | 03f3c74ceefdfc1077203c831643180c51e032cf (diff) | |
Removed setting for statistics, showing both instead.
| -rw-r--r-- | app/presenters/statistics_presenter.rb | 6 | ||||
| -rw-r--r-- | config/defaults.yml | 1 | ||||
| -rw-r--r-- | config/diaspora.yml.example | 3 | ||||
| -rw-r--r-- | spec/presenters/statistics_presenter_spec.rb | 8 |
4 files changed, 7 insertions, 11 deletions
diff --git a/app/presenters/statistics_presenter.rb b/app/presenters/statistics_presenter.rb index 199d64b67..f723fc639 100644 --- a/app/presenters/statistics_presenter.rb +++ b/app/presenters/statistics_presenter.rb @@ -19,10 +19,8 @@ class StatisticsPresenter result['local_comments'] = self.local_comments end result["services"] = Configuration::KNOWN_SERVICES.select {|service| AppConfig["services.#{service}.enable"]}.map(&:to_s) - if AppConfig.privacy.statistics.deprecated_format? - Configuration::KNOWN_SERVICES.each do |service, options| - result[service.to_s] = AppConfig["services.#{service}.enable"] - end + Configuration::KNOWN_SERVICES.each do |service, options| + result[service.to_s] = AppConfig["services.#{service}.enable"] end result diff --git a/config/defaults.yml b/config/defaults.yml index d30c2e009..01e2599be 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -53,7 +53,6 @@ defaults: user_counts: false post_counts: false comment_counts: false - deprecated_format: true settings: pod_name: 'diaspora*' enable_registrations: true diff --git a/config/diaspora.yml.example b/config/diaspora.yml.example index 4438d5e6a..d0f26efbb 100644 --- a/config/diaspora.yml.example +++ b/config/diaspora.yml.example @@ -210,9 +210,6 @@ configuration: ## Section #post_counts: true #comment_counts: true - ## Also show old services block (enabled by default) - #deprecated_format: false - ## General settings settings: ## Section diff --git a/spec/presenters/statistics_presenter_spec.rb b/spec/presenters/statistics_presenter_spec.rb index 3debcb598..ebd6e2ff7 100644 --- a/spec/presenters/statistics_presenter_spec.rb +++ b/spec/presenters/statistics_presenter_spec.rb @@ -17,7 +17,6 @@ describe StatisticsPresenter do AppConfig.privacy.statistics.user_counts = false AppConfig.privacy.statistics.post_counts = false AppConfig.privacy.statistics.comment_counts = false - AppConfig.privacy.statistics.deprecated_format = false end it 'provides generic pod data in json' do @@ -25,7 +24,11 @@ describe StatisticsPresenter do "name" => AppConfig.settings.pod_name, "version" => AppConfig.version_string, "registrations_open" => AppConfig.settings.enable_registrations, - "services"=> ["facebook",] + "services"=> ["facebook",], + "facebook" => true, + "tumblr" => false, + "twitter" => false, + "wordpress" => false, }) end @@ -34,7 +37,6 @@ describe StatisticsPresenter do AppConfig.privacy.statistics.user_counts = true AppConfig.privacy.statistics.post_counts = true AppConfig.privacy.statistics.comment_counts = true - AppConfig.privacy.statistics.deprecated_format = true AppConfig.services = { "facebook" => {"enable" => true}, "twitter" => {"enable" => true}, |