diff --git a/app/helpers/feeds_helper.rb b/app/helpers/feeds_helper.rb index 1657a6887..a863de56c 100644 --- a/app/helpers/feeds_helper.rb +++ b/app/helpers/feeds_helper.rb @@ -13,15 +13,15 @@ module FeedsHelper end def feed_debates_enabled? - Setting["feature.homepage.widgets.feeds.debates"].present? + Setting["homepage.widgets.feeds.debates"].present? end def feed_proposals_enabled? - Setting["feature.homepage.widgets.feeds.proposals"].present? + Setting["homepage.widgets.feeds.proposals"].present? end def feed_processes_enabled? - Setting["feature.homepage.widgets.feeds.processes"].present? + Setting["homepage.widgets.feeds.processes"].present? end def feed_debates_and_proposals_enabled? diff --git a/app/models/widget/feed.rb b/app/models/widget/feed.rb index 4fc23a1dd..eacd79329 100644 --- a/app/models/widget/feed.rb +++ b/app/models/widget/feed.rb @@ -8,7 +8,7 @@ class Widget::Feed < ActiveRecord::Base end def setting - Setting.where(key: "feature.homepage.widgets.feeds.#{kind}").first + Setting.where(key: "homepage.widgets.feeds.#{kind}").first end def self.active diff --git a/db/dev_seeds/settings.rb b/db/dev_seeds/settings.rb index 157e99b72..6823c2c80 100644 --- a/db/dev_seeds/settings.rb +++ b/db/dev_seeds/settings.rb @@ -71,7 +71,7 @@ section "Creating Settings" do Setting.create(key: "related_content_score_threshold", value: -0.3) Setting.create(key: "hot_score_period_in_days", value: 31) - Setting["feature.homepage.widgets.feeds.proposals"] = true - Setting["feature.homepage.widgets.feeds.debates"] = true - Setting["feature.homepage.widgets.feeds.processes"] = true + Setting.create(key: "homepage.widgets.feeds.proposals", value: "true") + Setting.create(key: "homepage.widgets.feeds.debates", value: "true") + Setting.create(key: "homepage.widgets.feeds.processes", value: "true") end diff --git a/db/seeds.rb b/db/seeds.rb index 581e5e932..3b012f406 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -115,9 +115,10 @@ Setting["map.zoom"] = 10 # Related content Setting["related_content_score_threshold"] = -0.3 -Setting["feature.homepage.widgets.feeds.proposals"] = true -Setting["feature.homepage.widgets.feeds.debates"] = true -Setting["feature.homepage.widgets.feeds.processes"] = true +# Homepage +Setting["homepage.widgets.feeds.proposals"] = true +Setting["homepage.widgets.feeds.debates"] = true +Setting["homepage.widgets.feeds.processes"] = true # Votes hot_score configuration Setting["hot_score_period_in_days"] = 31 diff --git a/spec/features/admin/homepage/homepage_spec.rb b/spec/features/admin/homepage/homepage_spec.rb index c62353283..d82f39d99 100644 --- a/spec/features/admin/homepage/homepage_spec.rb +++ b/spec/features/admin/homepage/homepage_spec.rb @@ -6,9 +6,9 @@ feature "Homepage" do admin = create(:administrator).user login_as(admin) - Setting["feature.homepage.widgets.feeds.proposals"] = false - Setting["feature.homepage.widgets.feeds.debates"] = false - Setting["feature.homepage.widgets.feeds.processes"] = false + Setting["homepage.widgets.feeds.proposals"] = false + Setting["homepage.widgets.feeds.debates"] = false + Setting["homepage.widgets.feeds.processes"] = false Setting["feature.user.recommendations"] = false end