From 206be22174b50ef3d6d6a1fa607d0daf29d7f538 Mon Sep 17 00:00:00 2001
From: Finn Bacall <finn.bacall@manchester.ac.uk>
Date: Mon, 22 Dec 2025 15:19:34 +0000
Subject: [PATCH 1/9] Initial attempt at toggling features on/off in spaces.
 #1205

---
 app/controllers/spaces_controller.rb          |  2 +-
 app/helpers/spaces_helper.rb                  |  4 +++
 app/models/default_space.rb                   |  4 +++
 app/models/space.rb                           | 30 +++++++++++++++++++
 app/views/layouts/_header.html.erb            |  2 +-
 app/views/spaces/_form.html.erb               |  4 +++
 config/locales/en.yml                         |  1 +
 ...2142740_add_disabled_features_to_spaces.rb |  5 ++++
 db/schema.rb                                  |  3 +-
 9 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20251222142740_add_disabled_features_to_spaces.rb

diff --git a/app/controllers/spaces_controller.rb b/app/controllers/spaces_controller.rb
index 8d118e303..0f82b4f16 100644
--- a/app/controllers/spaces_controller.rb
+++ b/app/controllers/spaces_controller.rb
@@ -76,7 +76,7 @@ def set_space
   end
 
   def space_params
-    permitted = [:title, :description, :theme, :image, :image_url, { administrator_ids: [] }]
+    permitted = [:title, :description, :theme, :image, :image_url, { administrator_ids: [] }, { enabled_features: [] }]
     permitted += [:host] if current_user.is_admin?
     params.require(:space).permit(*permitted)
   end
diff --git a/app/helpers/spaces_helper.rb b/app/helpers/spaces_helper.rb
index 276301526..840d197b2 100644
--- a/app/helpers/spaces_helper.rb
+++ b/app/helpers/spaces_helper.rb
@@ -3,4 +3,8 @@ module SpacesHelper
   def spaces_info
     I18n.t('info.spaces.description')
   end
+
+  def space_feature_options
+    Space::FEATURES.map { |f| [t("features.#{f}.short"), f] }
+  end
 end
diff --git a/app/models/default_space.rb b/app/models/default_space.rb
index f0680d3d1..e29fd466a 100644
--- a/app/models/default_space.rb
+++ b/app/models/default_space.rb
@@ -60,4 +60,8 @@ def default?
   def administrators
     User.with_role('admin')
   end
+
+  def feature_enabled?(feature)
+    TeSS::Config.feature[feature]
+  end
 end
diff --git a/app/models/space.rb b/app/models/space.rb
index fc7049035..4e9b93d6f 100644
--- a/app/models/space.rb
+++ b/app/models/space.rb
@@ -1,4 +1,6 @@
 class Space < ApplicationRecord
+  FEATURES = %w[events materials elearning_materials learning_paths workflows collections trainers content_providers nodes].freeze
+
   include PublicActivity::Common
   include LogParameterChanges
 
@@ -15,6 +17,7 @@ class Space < ApplicationRecord
   has_many :administrators, through: :administrator_roles, source: :user, class_name: 'User'
 
   validates :theme, inclusion: { in: TeSS::Config.themes.keys, allow_blank: true }
+  validate :disabled_features_valid?
 
   has_image(placeholder: TeSS::Config.placeholder['content_provider'])
 
@@ -45,4 +48,31 @@ def default?
   def users_with_role(role)
     space_role_users.joins(:space_roles).where(space_roles: { key: role })
   end
+
+  def feature_enabled?(feature)
+    if FEATURES.include?(feature)
+      !disabled_features.include?(feature)
+    else
+      TeSS::Config.feature[feature]
+    end
+  end
+
+  def enabled_features= features
+    self.disabled_features = (FEATURES - features)
+  end
+
+  def enabled_features
+    (FEATURES - disabled_features)
+  end
+
+  private
+
+  def disabled_features_valid?
+    disabled_features.each do |feature|
+      next if feature.blank?
+      unless FEATURES.include?(feature)
+        errors.add(:disabled_features, :inclusion)
+      end
+    end
+  end
 end
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 5eff2026d..4a7ad65b7 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -54,7 +54,7 @@
             { feature: 'nodes', link: nodes_path },
             { feature: 'spaces', link: spaces_path }
           ].select do |t|
-            t[:feature] == 'about' || TeSS::Config.feature[t[:feature]]
+            t[:feature] == 'about' || Space.current_space.feature_enabled?(t[:feature])
           end.sort_by do |t|
             TeSS::Config.site['tab_order'].index(t[:feature]) || 99
           end
diff --git a/app/views/spaces/_form.html.erb b/app/views/spaces/_form.html.erb
index aa2de5cbf..c36b24a79 100644
--- a/app/views/spaces/_form.html.erb
+++ b/app/views/spaces/_form.html.erb
@@ -19,6 +19,10 @@
                       id_field: :id,
                       existing_items_method: :administrators %>
 
+  <div>
+    <%= f.input :enabled_features, label: t('features.enabled'), collection: space_feature_options, as: :check_boxes %>
+  </div>
+
   <div class="form-group">
     <%= f.submit(class: 'btn btn-primary') %>
     <%= link_to t('.cancel', default:  t("helpers.links.cancel")),
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d5650cfb0..cf12c411a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,5 +1,6 @@
 en:
   features:
+    enabled: Features enabled
     about:
       short: About
       long: About
diff --git a/db/migrate/20251222142740_add_disabled_features_to_spaces.rb b/db/migrate/20251222142740_add_disabled_features_to_spaces.rb
new file mode 100644
index 000000000..a07e19b4e
--- /dev/null
+++ b/db/migrate/20251222142740_add_disabled_features_to_spaces.rb
@@ -0,0 +1,5 @@
+class AddDisabledFeaturesToSpaces < ActiveRecord::Migration[7.2]
+  def change
+    add_column :spaces, :disabled_features, :string, array: true, default: []
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 769407996..b3a246afe 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2025_12_01_143501) do
+ActiveRecord::Schema[7.2].define(version: 2025_12_22_142740) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -511,6 +511,7 @@
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.text "image_url"
+    t.string "disabled_features", default: [], array: true
     t.index ["host"], name: "index_spaces_on_host", unique: true
     t.index ["user_id"], name: "index_spaces_on_user_id"
   end

From b9a408092fb6926b7b8b29c04c85a7a148d85c38 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 22 Dec 2025 17:30:10 +0000
Subject: [PATCH 2/9] Initial plan


From a3c92b9d6f6518c8e72c1281f80bb9ea7c19aa16 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 22 Dec 2025 17:34:36 +0000
Subject: [PATCH 3/9] Add comprehensive tests for Space disabled_features field

Co-authored-by: fbacall <503373+fbacall@users.noreply.github.com>
---
 test/controllers/static_controller_test.rb | 174 +++++++++++++++++++++
 test/models/space_test.rb                  |  83 ++++++++++
 2 files changed, 257 insertions(+)

diff --git a/test/controllers/static_controller_test.rb b/test/controllers/static_controller_test.rb
index 7da77d111..076884e94 100644
--- a/test/controllers/static_controller_test.rb
+++ b/test/controllers/static_controller_test.rb
@@ -520,4 +520,178 @@ class StaticControllerTest < ActionController::TestCase
       end
     end
   end
+
+  test 'should respect space disabled_features when displaying tabs' do
+    space = spaces(:plants)
+    space.disabled_features = ['events', 'materials']
+    space.save!
+
+    features = { 
+      'events': true,
+      'materials': true,
+      'elearning_materials': true,
+      'workflows': true,
+      'collections': true,
+      'content_providers': true,
+      'trainers': true,
+      'nodes': true,
+      'spaces': true
+    }
+
+    with_settings(feature: features) do
+      with_host('plants.mytess.training') do
+        get :home
+        
+        # These should NOT appear because they're disabled for this space
+        assert_select 'ul.nav.navbar-nav' do
+          assert_select 'li a[href=?]', events_path, count: 0
+          assert_select 'li a[href=?]', materials_path, count: 0
+        end
+        
+        # These should still appear because they're not disabled
+        assert_select 'ul.nav.navbar-nav' do
+          assert_select 'li a[href=?]', about_path
+          assert_select 'li a[href=?]', elearning_materials_path
+          assert_select 'li a[href=?]', workflows_path
+          assert_select 'li a[href=?]', collections_path
+        end
+      end
+    end
+  end
+
+  test 'space disabled_features do not affect default space' do
+    space = spaces(:plants)
+    space.disabled_features = ['events', 'materials']
+    space.save!
+
+    features = { 
+      'events': true,
+      'materials': true,
+      'elearning_materials': true,
+      'workflows': true,
+      'collections': true,
+      'content_providers': true,
+      'trainers': true,
+      'nodes': true,
+      'spaces': true
+    }
+
+    with_settings(feature: features) do
+      # Access the default space (not plants)
+      get :home
+      
+      # All features should appear in the default space
+      assert_select 'ul.nav.navbar-nav' do
+        assert_select 'li a[href=?]', about_path
+        assert_select 'li a[href=?]', events_path
+        assert_select 'li a[href=?]', materials_path
+        assert_select 'li a[href=?]', elearning_materials_path
+        assert_select 'li a[href=?]', workflows_path
+        assert_select 'li a[href=?]', collections_path
+      end
+    end
+  end
+
+  test 'different spaces can have different disabled features' do
+    plants_space = spaces(:plants)
+    plants_space.disabled_features = ['events']
+    plants_space.save!
+
+    astro_space = spaces(:astro)
+    astro_space.disabled_features = ['materials']
+    astro_space.save!
+
+    features = { 
+      'events': true,
+      'materials': true,
+      'workflows': true,
+      'spaces': true
+    }
+
+    with_settings(feature: features) do
+      # Check plants space - events disabled
+      with_host('plants.mytess.training') do
+        get :home
+        
+        assert_select 'ul.nav.navbar-nav' do
+          assert_select 'li a[href=?]', events_path, count: 0
+          assert_select 'li a[href=?]', materials_path
+          assert_select 'li a[href=?]', workflows_path
+        end
+      end
+
+      # Check astro space - materials disabled
+      with_host('space.mytess.training') do
+        get :home
+        
+        assert_select 'ul.nav.navbar-nav' do
+          assert_select 'li a[href=?]', events_path
+          assert_select 'li a[href=?]', materials_path, count: 0
+          assert_select 'li a[href=?]', workflows_path
+        end
+      end
+    end
+  end
+
+  test 'space with no disabled features shows all enabled global features' do
+    space = spaces(:plants)
+    space.disabled_features = []
+    space.save!
+
+    features = { 
+      'events': true,
+      'materials': true,
+      'elearning_materials': true,
+      'workflows': true,
+      'collections': true,
+      'content_providers': true,
+      'trainers': true,
+      'nodes': true,
+      'spaces': true
+    }
+
+    with_settings(feature: features) do
+      with_host('plants.mytess.training') do
+        get :home
+        
+        # All globally enabled features should appear
+        assert_select 'ul.nav.navbar-nav' do
+          assert_select 'li a[href=?]', about_path
+          assert_select 'li a[href=?]', events_path
+          assert_select 'li a[href=?]', materials_path
+          assert_select 'li a[href=?]', elearning_materials_path
+          assert_select 'li a[href=?]', workflows_path
+          assert_select 'li a[href=?]', collections_path
+        end
+      end
+    end
+  end
+
+  test 'space disabled features work with directory tabs' do
+    space = spaces(:plants)
+    space.disabled_features = ['content_providers']
+    space.save!
+
+    features = { 
+      'events': true,
+      'materials': true,
+      'content_providers': true,
+      'trainers': true,
+      'nodes': true,
+      'spaces': true
+    }
+
+    with_settings(feature: features, site: { tab_order: [], directory_tabs: ['content_providers', 'trainers', 'nodes'] }) do
+      with_host('plants.mytess.training') do
+        get :home
+        
+        # content_providers should not appear even in directory menu
+        assert_select 'li.dropdown.directory-menu' do
+          assert_select 'li a[href=?]', content_providers_path, count: 0
+          assert_select 'li a[href=?]', trainers_path
+          assert_select 'li a[href=?]', nodes_path
+        end
+      end
+    end
+  end
 end
diff --git a/test/models/space_test.rb b/test/models/space_test.rb
index 7db2d15a1..91befd709 100644
--- a/test/models/space_test.rb
+++ b/test/models/space_test.rb
@@ -31,4 +31,87 @@ class SpaceTest < ActiveSupport::TestCase
 
     assert_empty @space.administrators
   end
+
+  test 'disabled_features defaults to empty array' do
+    new_space = Space.new(title: 'Test Space', host: 'test.example.com', user: users(:regular_user))
+    assert_equal [], new_space.disabled_features
+  end
+
+  test 'disabled_features can be set to valid features' do
+    @space.disabled_features = ['events', 'materials']
+    assert @space.valid?
+    assert_equal ['events', 'materials'], @space.disabled_features
+  end
+
+  test 'disabled_features rejects invalid features' do
+    @space.disabled_features = ['invalid_feature', 'events']
+    assert_not @space.valid?
+    assert_includes @space.errors[:disabled_features], :inclusion
+  end
+
+  test 'disabled_features allows empty strings' do
+    @space.disabled_features = ['events', '', 'materials']
+    assert @space.valid?
+  end
+
+  test 'feature_enabled? returns true for enabled features' do
+    @space.disabled_features = ['materials']
+    assert @space.feature_enabled?('events')
+    assert @space.feature_enabled?('workflows')
+  end
+
+  test 'feature_enabled? returns false for disabled features' do
+    @space.disabled_features = ['events', 'materials']
+    assert_not @space.feature_enabled?('events')
+    assert_not @space.feature_enabled?('materials')
+  end
+
+  test 'feature_enabled? returns true when no features are disabled' do
+    @space.disabled_features = []
+    Space::FEATURES.each do |feature|
+      assert @space.feature_enabled?(feature), "Feature #{feature} should be enabled"
+    end
+  end
+
+  test 'feature_enabled? falls back to TeSS::Config for non-space features' do
+    @space.disabled_features = []
+    # Test with a feature that's not in Space::FEATURES
+    with_settings(feature: { 'custom_feature' => true }) do
+      assert @space.feature_enabled?('custom_feature')
+    end
+    
+    with_settings(feature: { 'custom_feature' => false }) do
+      assert_not @space.feature_enabled?('custom_feature')
+    end
+  end
+
+  test 'enabled_features returns all features except disabled ones' do
+    @space.disabled_features = ['events', 'materials']
+    enabled = @space.enabled_features
+    
+    assert_not_includes enabled, 'events'
+    assert_not_includes enabled, 'materials'
+    assert_includes enabled, 'workflows'
+    assert_includes enabled, 'collections'
+  end
+
+  test 'enabled_features= sets disabled_features to complement' do
+    @space.enabled_features = ['events', 'materials']
+    
+    assert_includes @space.disabled_features, 'workflows'
+    assert_includes @space.disabled_features, 'collections'
+    assert_includes @space.disabled_features, 'elearning_materials'
+    assert_not_includes @space.disabled_features, 'events'
+    assert_not_includes @space.disabled_features, 'materials'
+  end
+
+  test 'enabled_features= with empty array disables all features' do
+    @space.enabled_features = []
+    assert_equal Space::FEATURES.sort, @space.disabled_features.sort
+  end
+
+  test 'enabled_features= with all features enables all features' do
+    @space.enabled_features = Space::FEATURES
+    assert_equal [], @space.disabled_features
+  end
 end

From 4e690d7c04bc44a0d7f16b7442f0cc31043c75c3 Mon Sep 17 00:00:00 2001
From: Finn Bacall <finn.bacall@manchester.ac.uk>
Date: Mon, 22 Dec 2025 18:04:30 +0000
Subject: [PATCH 4/9] Test fixes

---
 test/fixtures/spaces.yml  | 2 ++
 test/models/space_test.rb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/fixtures/spaces.yml b/test/fixtures/spaces.yml
index a87549fb4..51367a58e 100644
--- a/test/fixtures/spaces.yml
+++ b/test/fixtures/spaces.yml
@@ -6,7 +6,9 @@ plants:
 astro:
   title: TeSS Space Community
   host: space.mytess.training
+  user: curator
 
 other:
   title: Other TeSS Community
   host: other.mytess.training
+  user: curator
diff --git a/test/models/space_test.rb b/test/models/space_test.rb
index 91befd709..58460bbac 100644
--- a/test/models/space_test.rb
+++ b/test/models/space_test.rb
@@ -46,7 +46,7 @@ class SpaceTest < ActiveSupport::TestCase
   test 'disabled_features rejects invalid features' do
     @space.disabled_features = ['invalid_feature', 'events']
     assert_not @space.valid?
-    assert_includes @space.errors[:disabled_features], :inclusion
+    assert @space.errors.added?(:disabled_features, :inclusion)
   end
 
   test 'disabled_features allows empty strings' do

From 4c4a8c71c4e540db74886d7ef34d40ae8bb720ed Mon Sep 17 00:00:00 2001
From: Finn Bacall <finn.bacall@manchester.ac.uk>
Date: Mon, 22 Dec 2025 18:14:29 +0000
Subject: [PATCH 5/9] Add extra users to own the other spaces

---
 test/fixtures/spaces.yml |  4 ++--
 test/fixtures/users.yml  | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/test/fixtures/spaces.yml b/test/fixtures/spaces.yml
index 51367a58e..903f10857 100644
--- a/test/fixtures/spaces.yml
+++ b/test/fixtures/spaces.yml
@@ -6,9 +6,9 @@ plants:
 astro:
   title: TeSS Space Community
   host: space.mytess.training
-  user: curator
+  user: astro_owner
 
 other:
   title: Other TeSS Community
   host: other.mytess.training
-  user: curator
+  user: other_owner
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index e36adb440..8e006a238 100644
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -172,3 +172,15 @@ space_admin:
   email: 'plantboss@example.com'
   encrypted_password: <%= Devise::Encryptor.digest(User, 'plantsrule') %>
   confirmed_at: <%= Time.zone.now %>
+
+astro_owner:
+  username: 'astro_boss'
+  email: 'astroboss@example.com'
+  encrypted_password: <%= Devise::Encryptor.digest(User, 'spacerules') %>
+  confirmed_at: <%= Time.zone.now %>
+
+other_owner:
+  username: 'other_boss'
+  email: 'otherboss@example.com'
+  encrypted_password: <%= Devise::Encryptor.digest(User, 'password') %>
+  confirmed_at: <%= Time.zone.now %>

From b893d7fc36299e01596bef3336a9dbb42d6b92db Mon Sep 17 00:00:00 2001
From: Finn Bacall <finn.bacall@manchester.ac.uk>
Date: Mon, 22 Dec 2025 19:06:38 +0000
Subject: [PATCH 6/9] Use new `Space#feature_enabled?` method for checking if a
 feature is used

---
 app/views/about/_about_nav.html.erb           |  2 +-
 app/views/about/_links.html.erb               |  2 +-
 app/views/about/developers.erb                |  6 +--
 app/views/about/tess.html.erb                 |  6 +--
 app/views/collections/show.html.erb           | 12 +++---
 app/views/content_providers/_form.html.erb    |  2 +-
 .../_content_provider_sidebar.html.erb        |  2 +-
 app/views/content_providers/show.html.erb     |  8 ++--
 app/views/events/_form.html.erb               |  2 +-
 app/views/learning_path_topics/show.html.erb  |  8 ++--
 app/views/learning_paths/_form.html.erb       |  2 +-
 app/views/materials/_form.html.erb            | 38 +++++++++----------
 .../partials/_associated_node_info.html.erb   |  2 +-
 app/views/nodes/show.html.erb                 | 12 +++---
 .../static/home/_provider_carousel.html.erb   |  2 +-
 app/views/trainers/index.html.erb             |  2 +-
 app/views/users/_form.html.erb                |  2 +-
 app/views/users/show.html.erb                 | 14 +++----
 18 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/app/views/about/_about_nav.html.erb b/app/views/about/_about_nav.html.erb
index 8350deb36..2ce1ae21c 100644
--- a/app/views/about/_about_nav.html.erb
+++ b/app/views/about/_about_nav.html.erb
@@ -24,7 +24,7 @@
   </ul>
 
   <!-- REGISTERING YOUR LEARNING PATHS -->
-  <% if TeSS::Config.feature['learning_paths'] %>
+  <% if Space.current_space.feature_enabled?('learning_paths') %>
     <ul class="nav nav-stacked <%= show_active(show, 'learning_paths') %>">
       <li class="about-page-category">
         <%= link_to t('about.sidebar.learning_paths'), registering_learning_paths_path %>
diff --git a/app/views/about/_links.html.erb b/app/views/about/_links.html.erb
index 722811717..1374423ef 100644
--- a/app/views/about/_links.html.erb
+++ b/app/views/about/_links.html.erb
@@ -1,7 +1,7 @@
 <div class="quick-links">
   <%= link_to 'What is ' + TeSS::Config.site['title_short'] + '?', about_path, class: ('selected-tab' if show == 'tess') %>
   | <%= link_to 'How to Register', registering_resources_path, class: ('selected-tab' if show == 'registering') %>
-  <% if TeSS::Config.feature['learning_paths'] %>
+  <% if Space.current_space.feature_enabled?('learning_paths') %>
     | <%= link_to 'Learning Paths', registering_learning_paths_path, class: ('selected-tab' if show == 'learning_paths') %>
   <% end %>
   | <%= link_to 'Developers Guide', developers_path, class: ('selected-tab' if show == 'developer') %>
diff --git a/app/views/about/developers.erb b/app/views/about/developers.erb
index 571bf7a45..c0e6e7610 100644
--- a/app/views/about/developers.erb
+++ b/app/views/about/developers.erb
@@ -72,7 +72,7 @@
 
         <p>
           <!-- Events -->
-          <% if TeSS::Config.feature['events'] %>
+          <% if Space.current_space.feature_enabled?('events') %>
             <code>
               <a href="<%= TeSS::Config.base_url %><%== t 'developer.api_example_1' %>">
                 <%= TeSS::Config.base_url %><%== t 'developer.api_example_1' %></a>
@@ -80,7 +80,7 @@
           <% end %>
 
           <!-- Materials -->
-          <% if TeSS::Config.feature['materials'] %>
+          <% if Space.current_space.feature_enabled?('materials') %>
             <code>
               <a href="<%= TeSS::Config.base_url %><%== t 'developer.api_example_3' %>">
                 <%= TeSS::Config.base_url %><%== t 'developer.api_example_3' %> </a>
@@ -88,7 +88,7 @@
           <% end %>
 
           <!-- Providers -->
-          <% if TeSS::Config.feature['content_providers'] %>
+          <% if Space.current_space.feature_enabled?('content_providers') %>
             <code>
               <a href="<%= TeSS::Config.base_url %><%== t 'developer.api_example_4' %>">
                 <%= TeSS::Config.base_url %><%== t 'developer.api_example_4' %> </a>
diff --git a/app/views/about/tess.html.erb b/app/views/about/tess.html.erb
index b98612c1e..c9a91bbd8 100644
--- a/app/views/about/tess.html.erb
+++ b/app/views/about/tess.html.erb
@@ -38,7 +38,7 @@
       <% @feature_count = 0 %>
 
       <!-- EVENTS-->
-      <% if TeSS::Config.feature['events'] == true %>
+      <% if Space.current_space.feature_enabled?('events') %>
         <div id="events" class="row <%= next_about_block(@feature_count += 1) %>">
           <h3 class="col-lg-12"><%= t('about.headings.events') %></h3>
           <div class="col-lg-2 col-lg-push-10 about-resource-icon">
@@ -59,7 +59,7 @@
       <% end %>
 
       <!-- MATERIALS-->
-      <% if TeSS::Config.feature['materials'] == true %>
+      <% if Space.current_space.feature_enabled?('materials') %>
         <div id="materials" class="row <%= next_about_block(@feature_count += 1) %>">
           <h3 class="col-lg-12"><%= t('about.headings.materials') %></h3>
 
@@ -83,7 +83,7 @@
       <% end %>
 
       <!-- WORKFLOWS -->
-      <% if TeSS::Config.feature['workflows'] == true %>
+      <% if TeSS::Config.feature['workflows'] %>
         <div id="workflows" class="row <%= next_about_block(@feature_count += 1) %>">
           <h3 class="col-lg-12"><%= t('about.headings.workflows') %></h3>
           <div class="col-lg-2 col-lg-push-10 about-resource-icon">
diff --git a/app/views/collections/show.html.erb b/app/views/collections/show.html.erb
index b361d2bd8..56f45a783 100644
--- a/app/views/collections/show.html.erb
+++ b/app/views/collections/show.html.erb
@@ -11,11 +11,11 @@
           <%= render partial: 'collaborations/collaborators_button', locals: { resource: @collection } %>
         <% end %>
         <% if TeSS::Config.feature['collection_curation'] && current_user && policy(@collection).curate? %>
-          <% if TeSS::Config.feature['events'] %>
+          <% if Space.current_space.feature_enabled?('events') %>
             <%= link_to t('.curate_events', default: [:'helpers.links.events', 'events']),
                         curate_events_collection_path(@collection), class: 'btn btn-default' %>
           <% end %>
-          <% if TeSS::Config.feature['materials'] %>
+          <% if Space.current_space.feature_enabled?('materials') %>
             <%= link_to t('.curate_materials', default: [:'helpers.links.materials', 'materials']),
                         curate_materials_collection_path(@collection), class: 'btn btn-default' %>
           <% end %>
@@ -33,12 +33,12 @@
       <% not_finished_events_count = e.not_finished.count %>
       <% activator = tab_activator %>
       <ul class="nav nav-tabs">
-        <% if TeSS::Config.feature['materials'] %>
+        <% if Space.current_space.feature_enabled?('materials') %>
           <%= tab('Materials', icon_class_for_model('materials'), 'materials', activator: activator,
                   disabled: { check: materials_count.zero?, message: 'No registered training materials' },
                   count: materials_count) %>
         <% end %>
-        <% if TeSS::Config.feature['events'] %>
+        <% if Space.current_space.feature_enabled?('events') %>
           <%= tab('Events', icon_class_for_model('events'), 'events', activator: activator,
                   disabled: { check: events_count.zero?, message: 'No associated events' },
                   count: not_finished_events_count.zero? && events_count.positive? ? '0*' : not_finished_events_count) %>
@@ -47,7 +47,7 @@
     </div>
 
     <div class="tab-content ml-3">
-      <% if TeSS::Config.feature['materials'] %>
+      <% if Space.current_space.feature_enabled?('materials') %>
         <%= render partial: 'common/associated_resources',
                    locals: { model: Material,
                              total_count: materials_count,
@@ -56,7 +56,7 @@
                              view_all_link: materials_path(collections: @collection.title) } %>
       <% end %>
 
-      <% if TeSS::Config.feature['events'] %>
+      <% if Space.current_space.feature_enabled?('events') %>
         <%= render partial: 'common/associated_events',
                    locals: { total_count: events_count,
                              resources: event_items,
diff --git a/app/views/content_providers/_form.html.erb b/app/views/content_providers/_form.html.erb
index 12c37ef10..ca6544ded 100644
--- a/app/views/content_providers/_form.html.erb
+++ b/app/views/content_providers/_form.html.erb
@@ -37,7 +37,7 @@
   <%= f.multi_input :keywords %>
 
   <!-- Nodes: check feature enabled -->
-  <% if TeSS::Config.feature['nodes'] %>
+  <% if Space.current_space.feature_enabled?('nodes') %>
     <%= f.input :node_id, label: 'ELIXIR node', collection: Node.order(:name).all, label_method: :name %>
   <% end %>
 
diff --git a/app/views/content_providers/partials/_content_provider_sidebar.html.erb b/app/views/content_providers/partials/_content_provider_sidebar.html.erb
index f60c66819..f245f3e9f 100644
--- a/app/views/content_providers/partials/_content_provider_sidebar.html.erb
+++ b/app/views/content_providers/partials/_content_provider_sidebar.html.erb
@@ -10,7 +10,7 @@
     <%= content_provider.keywords.join(', ') %>
   </div>
 <% end %>
-<% unless content_provider.node.blank? || !TeSS::Config.feature['nodes'] %>
+<% unless content_provider.node.blank? || !Space.current_space.feature_enabled?('nodes') %>
   <h4 class="nav-heading">ELIXIR node</h4>
   <div class="nav-block">
     <p>
diff --git a/app/views/content_providers/show.html.erb b/app/views/content_providers/show.html.erb
index dc0bc629c..ab4d8b283 100644
--- a/app/views/content_providers/show.html.erb
+++ b/app/views/content_providers/show.html.erb
@@ -32,12 +32,12 @@
       <% sources = @content_provider.sources.order(enabled: :desc, finished_at: :desc) %>
       <% activator = tab_activator %>
       <ul class="nav nav-tabs">
-        <% if TeSS::Config.feature['materials'] %>
+        <% if Space.current_space.feature_enabled?('materials') %>
           <%= tab('Materials', icon_class_for_model('materials'), 'materials', activator: activator,
                   disabled: { check: materials_count.zero?, message: 'No registered training materials' },
                   count: materials_count) %>
         <% end %>
-        <% if TeSS::Config.feature['events'] %>
+        <% if Space.current_space.feature_enabled?('events') %>
           <%= tab('Events', icon_class_for_model('events'), 'events', activator: activator,
                   disabled: { check: events_count.zero?, message: 'No associated events' },
                   count: not_finished_events_count.zero? && events_count.positive? ? '0*' : not_finished_events_count) %>
@@ -49,7 +49,7 @@
       </ul>
 
       <div class="tab-content">
-        <% if TeSS::Config.feature['materials'] %>
+        <% if Space.current_space.feature_enabled?('materials') %>
           <%= render partial: 'common/associated_resources',
                      locals: { model: Material,
                                total_count: materials_count,
@@ -59,7 +59,7 @@
                                view_all_link: materials_path(content_provider: @content_provider.title) } %>
         <% end %>
 
-        <% if TeSS::Config.feature['events'] %>
+        <% if Space.current_space.feature_enabled?('events') %>
           <%= render partial: 'common/associated_events',
                      locals: { total_count: upcoming_events.count,
                                past_count: past_events.count,
diff --git a/app/views/events/_form.html.erb b/app/views/events/_form.html.erb
index 897ff08f9..80fc6b5ae 100644
--- a/app/views/events/_form.html.erb
+++ b/app/views/events/_form.html.erb
@@ -157,7 +157,7 @@
   <!-- Fields: that need to be check for enabled/disabled -->
 
   <!-- Nodes: check feature enabled -->
-  <% if TeSS::Config.feature['nodes'] %>
+  <% if Space.current_space.feature_enabled?('nodes') %>
     <%= f.dropdown :node_ids, options: format_for_dropdown(Node.order(:name).all), label: 'Nodes',
                    errors: @event.errors[:node_ids] %>
   <% end %>
diff --git a/app/views/learning_path_topics/show.html.erb b/app/views/learning_path_topics/show.html.erb
index 17c5a2c6d..0a2b88e61 100644
--- a/app/views/learning_path_topics/show.html.erb
+++ b/app/views/learning_path_topics/show.html.erb
@@ -53,12 +53,12 @@
       <% not_finished_events_count = e.not_finished.count %>
       <% activator = tab_activator %>
       <ul class="nav nav-tabs">
-        <% if TeSS::Config.feature['materials'] %>
+        <% if Space.current_space.feature_enabled?('materials') %>
           <%= tab('Materials', icon_class_for_model('materials'), 'materials', activator: activator,
                   disabled: { check: materials_count.zero?, message: 'No registered training materials' },
                   count: materials_count) %>
         <% end %>
-        <% if TeSS::Config.feature['events'] %>
+        <% if Space.current_space.feature_enabled?('events') %>
           <%# tab('Events', icon_class_for_model('events'), 'events', activator: activator,
                   disabled: { check: events_count.zero?, message: 'No associated events' },
                   count: not_finished_events_count.zero? && events_count.positive? ? '0*' : not_finished_events_count) %>
@@ -67,7 +67,7 @@
     </div>
 
     <div class="tab-content ml-3">
-      <% if TeSS::Config.feature['materials'] %>
+      <% if Space.current_space.feature_enabled?('materials') %>
         <%= render partial: 'common/associated_resources',
                    locals: { model: Material,
                              total_count: materials_count,
@@ -76,7 +76,7 @@
                              view_all_link: materials_path(collections: @learning_path_topic.title) } %>
       <% end %>
 
-      <% if TeSS::Config.feature['events'] %>
+      <% if Space.current_space.feature_enabled?('events') %>
         <%= render partial: 'common/associated_events',
                    locals: { total_count: events_count,
                              resources: event_items,
diff --git a/app/views/learning_paths/_form.html.erb b/app/views/learning_paths/_form.html.erb
index 0ff158c11..5631be1c9 100644
--- a/app/views/learning_paths/_form.html.erb
+++ b/app/views/learning_paths/_form.html.erb
@@ -62,7 +62,7 @@
               visibility_toggle: TeSS::Config.feature['learning_paths_disabled'] %>
 
   <!-- Nodes: check feature enabled -->
-  <% if TeSS::Config.feature['nodes'] %>
+  <% if Space.current_space.feature_enabled?('nodes') %>
     <%= f.dropdown :node_ids, options: format_for_dropdown(Node.order(:name).all), label: 'Nodes' %>
   <% end %>
 
diff --git a/app/views/materials/_form.html.erb b/app/views/materials/_form.html.erb
index b71aac73a..7518a1ac1 100644
--- a/app/views/materials/_form.html.erb
+++ b/app/views/materials/_form.html.erb
@@ -27,84 +27,84 @@
 
   <!-- Field: Resource Type -->
   <%= f.multi_input :resource_type, label: 'Resource types', errors: @material.errors[:resource_type],
-                    title: t('materials.hints.resource_type'), visibility_toggle: TeSS::Config.feature['materials_disabled'] %>
+                    title: t('materials.hints.resource_type'), visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
 
   <!-- Field: Scientific Topics -->
   <%= f.autocompleter :scientific_topics, url: edam_topics_path, template: 'autocompleter/term',
                       id_field: :uri, label_field: :preferred_label,
-                      visibility_toggle: TeSS::Config.feature['materials_disabled'] %>
+                      visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
 
   <hr>
 
   <!-- Field: Keywords -->
-  <%= f.multi_input :keywords, title: t('materials.hints.keywords'), visibility_toggle: TeSS::Config.feature['materials_disabled'] %>
+  <%= f.multi_input :keywords, title: t('materials.hints.keywords'), visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
 
   <!-- Field: Licence -->
   <%= f.input :licence, collection: licence_options_for_select, as: :grouped_select, group_method: :last, group_label_method: :first,
               input_html: { title: t('materials.hints.licence'), class: 'js-select2' },
               prompt: 'Select a licence...', errors: @material.errors[:licence], field_lock: true,
-              visibility_toggle: TeSS::Config.feature['materials_disabled'] %>
+              visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
 
   <!-- Field: Status -->
   <%= f.input :status, collection: MaterialStatusDictionary.instance.options_for_select, prompt: 'Select a status...',
               errors: @material.errors[:status], input_html: { title: t('materials.hints.status') },
-              field_lock: true, visibility_toggle: TeSS::Config.feature['materials_disabled'] %>
+              field_lock: true, visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
 
   <!-- Field: Contact -->
   <%= f.input :contact, input_html: { rows: '5', title: t('materials.hints.contact') }, field_lock: true,
-              visibility_toggle: TeSS::Config.feature['materials_disabled'] %>
+              visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
 
   <!-- Field: DOI -->
   <%= f.input :doi, field_lock: true, input_html: { title: t('materials.hints.doi') },
-              visibility_toggle: TeSS::Config.feature['materials_disabled'] %>
+              visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
 
   <!-- Field: Version -->
   <%= f.input :version, input_html: { title: t('materials.hints.version') }, field_lock: true,
-              visibility_toggle: TeSS::Config.feature['materials_disabled'] %>
+              visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
 
   <!-- Field: Provider -->
   <%= f.input :content_provider_id, collection: current_user.get_editable_providers, label_method: :title, value_method: :id,
               include_blank: true, field_lock: true, input_html: { title: t('materials.hints.providers') },
-              visibility_toggle: TeSS::Config.feature['materials_disabled'] %>
+              visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
 
   <!-- Field: Authors -->
   <%= f.multi_input :authors, suggestions_url: people_autocomplete_suggestions_path, title: t('materials.hints.authors'),
-                    visibility_toggle: TeSS::Config.feature['materials_disabled'] %>
+                    visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
 
   <!-- Field: Contributors -->
   <%= f.multi_input :contributors, suggestions_url: people_autocomplete_suggestions_path, title: t('materials.hints.contributors'),
-                    visibility_toggle: TeSS::Config.feature['materials_disabled'] %>
+                    visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
 
   <!-- Field: Target Audience -->
   <%= f.multi_input :target_audience, label: 'Target audiences', errors: @material.errors[:target_audience],
-                    title: t('events.hints.targets'), visibility_toggle: TeSS::Config.feature['materials_disabled'] %>
+                    title: t('events.hints.targets'), visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
 
   <!-- Field: Prerequisites -->
   <%= f.input :prerequisites, as: :markdown_area, field_lock: true,
               input_html: { rows: '3', title: t('materials.hints.prerequisites') },
-              visibility_toggle: TeSS::Config.feature['materials_disabled'] %>
+              visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
 
   <!-- Field: Level -->
   <%= f.input :difficulty_level, collection: DifficultyDictionary.instance.options_for_select,
               label: 'Competency level', prompt: 'Select a difficulty level...', field_lock: true,
               errors: @material.errors[:difficulty_level], input_html: { title: t('materials.hints.difficulty') },
-              visibility_toggle: TeSS::Config.feature['materials_disabled'] %>
+              visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
 
   <!-- Field: Learning Objectives-->
   <%= f.input :learning_objectives, as: :markdown_area, field_lock: true,
               input_html: { rows: '3', title: t('materials.hints.objectives') },
-              visibility_toggle: TeSS::Config.feature['materials_disabled'] %>
+              visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
 
   <!-- Field: Date Created -->
   <%= f.input :date_created, as: :date_picker, field_lock: true, input_html: { title: t('materials.hints.date_created') },
-              visibility_toggle: TeSS::Config.feature['materials_disabled'] %>
+              visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
 
 
   <!-- Field: Dates -->
   <%= f.input :date_modified, as: :date_picker, field_lock: true, input_html: { title: t('materials.hints.date_modified') },
-              visibility_toggle: TeSS::Config.feature['materials_disabled'] %>
+              visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
   <%= f.input :date_published, as: :date_picker, field_lock: true, input_html: { title: t('materials.hints.date_published') },
-              visibility_toggle: TeSS::Config.feature['materials_disabled'] %>
+              visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
 
   <!-- Field: Other Types -->
   <%= f.input :other_types, input_html: { title: t('materials.hints.other_types') }, field_lock: true,
@@ -120,7 +120,7 @@
               visibility_toggle: TeSS::Config.feature['disabled'] %>
 
   <!-- Nodes: check feature enabled -->
-  <% if TeSS::Config.feature['nodes'] %>
+  <% if Space.current_space.feature_enabled?('nodes') %>
     <%= f.dropdown :node_ids, options: format_for_dropdown(Node.order(:name).all), label: 'Nodes' %>
   <% end %>
 
diff --git a/app/views/nodes/partials/_associated_node_info.html.erb b/app/views/nodes/partials/_associated_node_info.html.erb
index ec621aeaf..d33711970 100644
--- a/app/views/nodes/partials/_associated_node_info.html.erb
+++ b/app/views/nodes/partials/_associated_node_info.html.erb
@@ -3,7 +3,7 @@
 Variable that should be available
 - associated_nodes - an array (or AR collection) of nodes
 %>
-<% if TeSS::Config.feature['nodes'] %>
+<% if Space.current_space.feature_enabled?('nodes') %>
   <% if associated_nodes.any? %>
     <%# Content provider  %>
     <h4 class="nav-heading"><%= 'Node'.pluralize(associated_nodes.count) %></h4>
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index a4fc10f0f..82130d521 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -28,17 +28,17 @@
       <% not_finished_events_count = e.not_finished.count %>
       <% activator = tab_activator %>
       <ul class="nav nav-tabs">
-        <% if TeSS::Config.feature['materials'] %>
+        <% if Space.current_space.feature_enabled?('materials') %>
           <%= tab('Materials', icon_class_for_model('materials'), 'materials', activator: activator,
                   disabled: { check: materials_count.zero?, message: 'No registered training materials' },
                   count: materials_count) %>
         <% end %>
-        <% if TeSS::Config.feature['events'] %>
+        <% if Space.current_space.feature_enabled?('events') %>
           <%= tab('Events', icon_class_for_model('events'), 'events', activator: activator,
                   disabled: { check: events_count.zero?, message: 'No associated events' },
                   count: not_finished_events_count.zero? && events_count.positive? ? '0*' : not_finished_events_count) %>
         <% end %>
-        <% if TeSS::Config.feature['content_providers'] %>
+        <% if Space.current_space.feature_enabled?('content_providers') %>
           <%= tab('Providers', icon_class_for_model('content_providers'), 'content_providers', activator: activator,
                   disabled: { check: content_providers_count.zero?, message: 'No associated content providers' },
                   count: content_providers_count) %>
@@ -46,7 +46,7 @@
       </ul>
 
       <div class="tab-content">
-        <% if TeSS::Config.feature['materials'] %>
+        <% if Space.current_space.feature_enabled?('materials') %>
           <%= render partial: 'common/associated_resources',
                      locals: { model: Material,
                                total_count: materials_count,
@@ -56,7 +56,7 @@
                                view_all_link: materials_path(node: @node.name) } %>
         <% end %>
 
-        <% if TeSS::Config.feature['events'] %>
+        <% if Space.current_space.feature_enabled?('events') %>
           <%= render partial: 'common/associated_events',
                      locals: { total_count: upcoming_events.count,
                                past_count: past_events.count,
@@ -67,7 +67,7 @@
                                inc_expired_link: events_path(node: @node.name, include_expired: true) } %>
         <% end %>
 
-        <% if TeSS::Config.feature['content_providers'] %>
+        <% if Space.current_space.feature_enabled?('content_providers') %>
           <%= render partial: 'common/associated_resources',
                      locals: { model: ContentProvider,
                                total_count: content_providers_count,
diff --git a/app/views/static/home/_provider_carousel.html.erb b/app/views/static/home/_provider_carousel.html.erb
index b392f0a12..af76fb9fa 100644
--- a/app/views/static/home/_provider_carousel.html.erb
+++ b/app/views/static/home/_provider_carousel.html.erb
@@ -1,5 +1,5 @@
 <% per_slide = 3 %>
-<% return unless TeSS::Config.feature['content_providers'] %>
+<% return unless Space.current_space.feature_enabled?('content_providers') %>
 <% provider_ids = TeSS::Config.site.dig('home_page', 'featured_providers') %>
 <% provider_ids = ContentProvider.from_verified_users.
   where.not(image_file_size: nil).
diff --git a/app/views/trainers/index.html.erb b/app/views/trainers/index.html.erb
index f0366fa8f..5830f802d 100644
--- a/app/views/trainers/index.html.erb
+++ b/app/views/trainers/index.html.erb
@@ -10,7 +10,7 @@
     <h2><%=t("features.trainers.long")%></h2>
     <% content_for :buttons do %>
       <!-- Register button -->
-      <%= edit_button(current_user, text: t('register.buttons.trainers'), anchor: 'trainer_details') if current_user && policy(current_user).update? && TeSS::Config.feature['trainers'] %>
+      <%= edit_button(current_user, text: t('register.buttons.trainers'), anchor: 'trainer_details') if current_user && policy(current_user).update? && Space.current_space.feature_enabled?('trainers') %>
       <!-- Info -->
       <%= info_button("What are trainers in #{TeSS::Config.site['title_short']}?", hide_text: true) do %>
         <%= render_markdown(trainers_info) %>
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index 8dc9f1909..8ee2e305a 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -43,7 +43,7 @@
           <%= user_f.input :check_broken_scrapers %>
         <% end %>
 
-        <% if TeSS::Config.feature['trainers'] %>
+        <% if Space.current_space.feature_enabled?('trainers') %>
           <p><br/>
 
           <h3 id='trainer_details'>Trainer Details</h3>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index c3424da77..2bc7daa6c 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -57,7 +57,7 @@
         <% end %>
       </p>
 
-      <% if TeSS::Config.feature['trainers'] %>
+      <% if Space.current_space.feature_enabled?('trainers') %>
         <p>
           <strong>Included in Registry of Trainers:</strong>
           <% if @user.profile.public? %>
@@ -145,21 +145,21 @@
 
       <ul class="nav nav-tabs">
         <!-- Tab: Events -->
-        <% if TeSS::Config.feature['events'] %>
+        <% if Space.current_space.feature_enabled?('events') %>
           <%= tab('Events', icon_class_for_model('events'), 'events', activator: activator,
                   disabled: { check: events_count.zero?, message: 'No associated events' },
                   count: not_finished_events_count.zero? && events_count.positive? ? '0*' : not_finished_events_count) %>
         <% end %>
 
         <!-- Tab: Materials -->
-        <% if TeSS::Config.feature['materials'] %>
+        <% if Space.current_space.feature_enabled?('materials') %>
           <%= tab('Materials', icon_class_for_model('materials'), 'materials', activator: activator,
                   disabled: { check: materials.none?, message: 'No registered training materials' },
                   count: materials_count) %>
         <% end %>
 
         <!-- Tab: Collections -->
-        <% if TeSS::Config.feature['collections'] %>
+        <% if Space.current_space.feature_enabled?('collections') %>
           <%= tab('Collections', icon_class_for_model('collections'), 'collections', activator: activator,
                   disabled: { check: collections.none?, message: 'No registered collections' },
                   count: collections_count) %>
@@ -175,7 +175,7 @@
 
       <div class="tab-content">
         <!-- Tab: Events -->
-        <% if TeSS::Config.feature['events'] %>
+        <% if Space.current_space.feature_enabled?('events') %>
           <%= render partial: 'common/associated_events',
                      locals: { total_count: upcoming_events.count,
                                past_count: past_events.count,
@@ -187,7 +187,7 @@
         <% end %>
 
         <!-- Tab: Materials -->
-        <% if TeSS::Config.feature['materials'] %>
+        <% if Space.current_space.feature_enabled?('materials') %>
           <%= render partial: 'common/associated_resources',
                      locals: { model: Material,
                                total_count: materials_count,
@@ -198,7 +198,7 @@
         <% end %>
 
         <!-- Tab: Collections -->
-        <% if TeSS::Config.feature['collections'] %>
+        <% if Space.current_space.feature_enabled?('collections') %>
           <%= render partial: 'common/associated_resources',
                      locals: { model: Collection,
                                total_count: collections_count,

From 3399ffc0450e8c5a4b2a127bc2f699b5cc8230c4 Mon Sep 17 00:00:00 2001
From: Finn Bacall <finn.bacall@manchester.ac.uk>
Date: Tue, 23 Dec 2025 09:09:13 +0000
Subject: [PATCH 7/9] More `Space#feature_enabled?`

---
 app/controllers/communities_controller.rb        |  6 +++---
 app/controllers/materials_controller.rb          |  2 +-
 app/controllers/search_controller.rb             | 10 +++++-----
 app/controllers/static_controller.rb             |  6 +++---
 app/models/event.rb                              |  4 ++--
 app/models/learning_path.rb                      |  2 +-
 app/models/material.rb                           |  4 ++--
 app/models/source.rb                             |  2 +-
 app/views/about/developers.erb                   |  2 +-
 app/views/about/tess.html.erb                    |  2 +-
 app/views/static/home/_catalogue_blocks.html.erb |  2 +-
 app/views/users/show.html.erb                    |  4 ++--
 12 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/controllers/communities_controller.rb b/app/controllers/communities_controller.rb
index db5182704..38ec5196b 100644
--- a/app/controllers/communities_controller.rb
+++ b/app/controllers/communities_controller.rb
@@ -8,9 +8,9 @@ def show
     @resources = []
     if TeSS::Config.solr_enabled
       enabled = []
-      enabled.append(Event) if TeSS::Config.feature['events']
-      enabled.append(Material) if TeSS::Config.feature['materials']
-      enabled.append(Collection) if TeSS::Config.feature['collections']
+      enabled.append(Event) if Space.current_space.feature_enabled?('events')
+      enabled.append(Material) if Space.current_space.feature_enabled?('materials')
+      enabled.append(Collection) if Space.current_space.feature_enabled?('collections')
       enabled.each do |resource|
         @resources += resource.search_and_filter(nil, '', { 'max_age' => '1 month' },
                                                  sort_by: 'new', per_page: 5).results
diff --git a/app/controllers/materials_controller.rb b/app/controllers/materials_controller.rb
index 0322f4adc..fae541d5a 100644
--- a/app/controllers/materials_controller.rb
+++ b/app/controllers/materials_controller.rb
@@ -17,7 +17,7 @@ class MaterialsController < ApplicationController
   # GET /materials.json?q=queryparam
 
   def index
-    elearning = @facet_params[:resource_type] == 'e-learning' && TeSS::Config.feature['elearning_materials']
+    elearning = @facet_params[:resource_type] == 'e-learning' && Space.current_space.feature_enabled?('elearning_materials')
     @bioschemas = @materials.flat_map(&:to_bioschemas)
     respond_to do |format|
       format.html { render elearning ? 'elearning_materials/index' : 'index' }
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 77e062876..d6d543b0b 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -54,11 +54,11 @@ def search_params
   def search_models
     return @_models if @_models
     @_models = ['User']
-    @_models << 'Event' if TeSS::Config.feature['events']
-    @_models << 'Material' if TeSS::Config.feature['materials']
-    @_models << 'Collection' if TeSS::Config.feature['collections']
-    @_models << 'ContentProvider' if TeSS::Config.feature['content_providers']
-    @_models << 'Trainer' if TeSS::Config.feature['trainers']
+    @_models << 'Event' if Space.current_space.feature_enabled?('events')
+    @_models << 'Material' if Space.current_space.feature_enabled?('materials')
+    @_models << 'Collection' if Space.current_space.feature_enabled?('collections')
+    @_models << 'ContentProvider' if Space.current_space.feature_enabled?('content_providers')
+    @_models << 'Trainer' if Space.current_space.feature_enabled?('trainers')
     @_models
   end
 end
diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
index bff25aa81..5849d817a 100644
--- a/app/controllers/static_controller.rb
+++ b/app/controllers/static_controller.rb
@@ -9,9 +9,9 @@ def home
     @resources = []
     if TeSS::Config.solr_enabled
       enabled = []
-      enabled.append(Event) if TeSS::Config.feature['events']
-      enabled.append(Material) if TeSS::Config.feature['materials']
-      enabled.append(Collection) if TeSS::Config.feature['collections']
+      enabled.append(Event) if Space.current_space.feature_enabled?('events')
+      enabled.append(Material) if Space.current_space.feature_enabled?('materials')
+      enabled.append(Collection) if Space.current_space.feature_enabled?('collections')
       enabled.each do |resource|
         @resources += resource.search_and_filter(nil, '', { 'max_age' => '1 month' },
                                                  sort_by: 'new', per_page: 5).results
diff --git a/app/models/event.rb b/app/models/event.rb
index 6f2cf0762..bc95db606 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -203,8 +203,8 @@ def self.facet_fields
     field_list.delete('sponsors') if TeSS::Config.feature['disabled'].include? 'sponsors'
     field_list.delete('tools') if TeSS::Config.feature['disabled'].include? 'biotools'
     field_list.delete('fields') if TeSS::Config.feature['disabled'].include? 'ardc_fields_of_research'
-    field_list.delete('node') unless TeSS::Config.feature['nodes']
-    field_list.delete('collections') unless TeSS::Config.feature['collections']
+    field_list.delete('node') unless Space.current_space.feature_enabled?('nodes')
+    field_list.delete('collections') unless Space.current_space.feature_enabled?('collections')
     field_list.delete('organizer') unless TeSS::Config.feature['organizer']
     field_list.delete('contact') unless TeSS::Config.feature['contact']
 
diff --git a/app/models/learning_path.rb b/app/models/learning_path.rb
index e2c380fa5..cafc70476 100644
--- a/app/models/learning_path.rb
+++ b/app/models/learning_path.rb
@@ -96,7 +96,7 @@ def self.facet_fields
                     difficulty_level licence target_audience authors contributors user node status)
 
     field_list.delete('scientific_topics') if TeSS::Config.feature['disabled'].include? 'topics'
-    field_list.delete('node') unless TeSS::Config.feature['nodes']
+    field_list.delete('node') unless Space.current_space.feature_enabled?('nodes')
     field_list.delete('status') if TeSS::Config.feature['disabled'].include? 'status'
 
     field_list
diff --git a/app/models/material.rb b/app/models/material.rb
index 9e1726c08..40e7fc83e 100644
--- a/app/models/material.rb
+++ b/app/models/material.rb
@@ -140,8 +140,8 @@ def self.facet_fields
     field_list.delete('standard_database_or_policy') if TeSS::Config.feature['disabled'].include? 'fairshare'
     field_list.delete('tools') if TeSS::Config.feature['disabled'].include? 'biotools'
     field_list.delete('fields') if TeSS::Config.feature['disabled'].include? 'ardc_fields_of_research'
-    field_list.delete('node') unless TeSS::Config.feature['nodes']
-    field_list.delete('collections') unless TeSS::Config.feature['collections']
+    field_list.delete('node') unless Space.current_space.feature_enabled?('nodes')
+    field_list.delete('collections') unless Space.current_space.feature_enabled?('collections')
     field_list.delete('status') if TeSS::Config.feature['disabled'].include? 'status'
 
     field_list
diff --git a/app/models/source.rb b/app/models/source.rb
index 889bf44a0..370b1d0da 100644
--- a/app/models/source.rb
+++ b/app/models/source.rb
@@ -74,7 +74,7 @@ def ingestor_class
 
   def self.facet_fields
     field_list = %w( content_provider node method enabled approval_status )
-    field_list.delete('node') unless TeSS::Config.feature['nodes']
+    field_list.delete('node') unless Space.current_space.feature_enabled?('nodes')
     field_list
   end
 
diff --git a/app/views/about/developers.erb b/app/views/about/developers.erb
index c0e6e7610..8fe1fb509 100644
--- a/app/views/about/developers.erb
+++ b/app/views/about/developers.erb
@@ -96,7 +96,7 @@
           <% end %>
 
           <!-- Workflows -->
-          <% if TeSS::Config.feature['workflows'] %>
+          <% if Space.current_space.feature_enabled?('workflows') %>
             <code>
               <a href="<%= TeSS::Config.base_url %><%== t 'developer.api_example_5' %>">
                 <%= TeSS::Config.base_url %><%== t 'developer.api_example_5' %> </a>
diff --git a/app/views/about/tess.html.erb b/app/views/about/tess.html.erb
index c9a91bbd8..dbd3b876a 100644
--- a/app/views/about/tess.html.erb
+++ b/app/views/about/tess.html.erb
@@ -83,7 +83,7 @@
       <% end %>
 
       <!-- WORKFLOWS -->
-      <% if TeSS::Config.feature['workflows'] %>
+      <% if Space.current_space.feature_enabled?('workflows') %>
         <div id="workflows" class="row <%= next_about_block(@feature_count += 1) %>">
           <h3 class="col-lg-12"><%= t('about.headings.workflows') %></h3>
           <div class="col-lg-2 col-lg-push-10 about-resource-icon">
diff --git a/app/views/static/home/_catalogue_blocks.html.erb b/app/views/static/home/_catalogue_blocks.html.erb
index 8adaa44b0..7ed8f10ce 100644
--- a/app/views/static/home/_catalogue_blocks.html.erb
+++ b/app/views/static/home/_catalogue_blocks.html.erb
@@ -1,4 +1,4 @@
-<% features = ['events', 'materials', 'learning_paths', 'trainers'].select { |f| TeSS::Config.feature[f] } %>
+<% features = ['events', 'materials', 'learning_paths', 'trainers'].select { |f| Space.current_space.feature_enabled?(f) } %>
 
 <section id="catalogue">
   <h2 class="text-center"><%= t('home.catalogue.title') %></h2>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 2bc7daa6c..b3c46c5f1 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -166,7 +166,7 @@
         <% end %>
 
         <!-- Tab: Workflows -->
-        <% if TeSS::Config.feature['workflows'] %>
+        <% if Space.current_space.feature_enabled?('workflows') %>
           <%= tab('Workflows', icon_class_for_model('workflows'), 'workflows', activator: activator,
                   disabled: { check: workflows.none?, message: 'No workflows' },
                   count: workflows_count) %>
@@ -209,7 +209,7 @@
         <% end %>
 
         <!-- Tab: Workflows -->
-        <% if TeSS::Config.feature['workflows'] %>
+        <% if Space.current_space.feature_enabled?('workflows') %>
           <%= render partial: 'common/associated_resources',
                      locals: { model: Workflow,
                                total_count: workflows_count,

From fa0df60cd81c4ab2dda37739d9ed8fdf96655f3a Mon Sep 17 00:00:00 2001
From: Finn Bacall <finn.bacall@manchester.ac.uk>
Date: Tue, 23 Dec 2025 09:42:58 +0000
Subject: [PATCH 8/9] Constrain space-enabled features to those of the instance

---
 app/helpers/spaces_helper.rb               |  6 +++++-
 app/models/space.rb                        |  2 +-
 test/controllers/spaces_controller_test.rb | 24 ++++++++++++++++++++++
 test/controllers/static_controller_test.rb | 18 ++++++++++++++++
 test/models/space_test.rb                  | 14 +++++++++++++
 5 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/app/helpers/spaces_helper.rb b/app/helpers/spaces_helper.rb
index 840d197b2..9317ade62 100644
--- a/app/helpers/spaces_helper.rb
+++ b/app/helpers/spaces_helper.rb
@@ -5,6 +5,10 @@ def spaces_info
   end
 
   def space_feature_options
-    Space::FEATURES.map { |f| [t("features.#{f}.short"), f] }
+    Space::FEATURES.select do |f|
+      TeSS::Config.feature[f]
+    end.map do |f|
+      [t("features.#{f}.short"), f]
+    end
   end
 end
diff --git a/app/models/space.rb b/app/models/space.rb
index 4e9b93d6f..0398ac1d4 100644
--- a/app/models/space.rb
+++ b/app/models/space.rb
@@ -51,7 +51,7 @@ def users_with_role(role)
 
   def feature_enabled?(feature)
     if FEATURES.include?(feature)
-      !disabled_features.include?(feature)
+      TeSS::Config.feature[feature] && !disabled_features.include?(feature)
     else
       TeSS::Config.feature[feature]
     end
diff --git a/test/controllers/spaces_controller_test.rb b/test/controllers/spaces_controller_test.rb
index 4e523e7be..c33445860 100644
--- a/test/controllers/spaces_controller_test.rb
+++ b/test/controllers/spaces_controller_test.rb
@@ -238,4 +238,28 @@ class SpacesControllerTest < ActionController::TestCase
     assert_includes admins, existing_admin
     assert_includes admins, new_admin
   end
+
+  test 'only instance-enabled features are listed on management page' do
+    sign_in @space.user
+    features = { 'events': true,
+                 'materials': false,
+                 'elearning_materials': false,
+                 'learning_paths': false,
+                 'workflows': true,
+                 'collections': false,
+                 'content_providers': false,
+                 'trainers': false,
+                 'nodes': false
+    }
+
+    with_settings(feature: features) do
+      get :edit, params: { id: @space }
+      assert_response :success
+      assert_select '[name="space[enabled_features][]"]', count: 3 # +1 because of the blank input that allows you to
+                                                                   #  clear the list
+      assert_select '#space_enabled_features_events', count: 1
+      assert_select '#space_enabled_features_workflows', count: 1
+      assert_select '#space_enabled_features_materials', count: 0
+    end
+  end
 end
diff --git a/test/controllers/static_controller_test.rb b/test/controllers/static_controller_test.rb
index 076884e94..4c89cdaab 100644
--- a/test/controllers/static_controller_test.rb
+++ b/test/controllers/static_controller_test.rb
@@ -694,4 +694,22 @@ class StaticControllerTest < ActionController::TestCase
       end
     end
   end
+
+  test 'space enabled features are limited by instance enabled features' do
+    space = spaces(:plants)
+    space.disabled_features = []
+    space.save!
+
+    assert_includes space.enabled_features, 'events'
+
+    with_settings(feature: { 'events': false }) do
+      with_host('plants.mytess.training') do
+        get :home
+        assert_select 'ul.nav.navbar-nav' do
+          assert_select 'li a[href=?]', materials_path, count: 1
+          assert_select 'li a[href=?]', events_path, count: 0
+        end
+      end
+    end
+  end
 end
diff --git a/test/models/space_test.rb b/test/models/space_test.rb
index 58460bbac..785bfe833 100644
--- a/test/models/space_test.rb
+++ b/test/models/space_test.rb
@@ -85,6 +85,20 @@ class SpaceTest < ActiveSupport::TestCase
     end
   end
 
+  test 'feature_enabled? is limited by instance enabled features' do
+    @space.disabled_features = []
+    assert_includes @space.enabled_features, 'events'
+    with_settings(feature: { 'events' => true }) do
+      assert @space.feature_enabled?('events')
+      assert @space.feature_enabled?('materials')
+    end
+
+    with_settings(feature: { 'events' => false }) do
+      refute @space.feature_enabled?('events')
+      assert @space.feature_enabled?('materials')
+    end
+  end
+
   test 'enabled_features returns all features except disabled ones' do
     @space.disabled_features = ['events', 'materials']
     enabled = @space.enabled_features

From 42e2013d66f2f484797b224127e82cfede14b91d Mon Sep 17 00:00:00 2001
From: Finn Bacall <finn.bacall@manchester.ac.uk>
Date: Tue, 23 Dec 2025 10:01:49 +0000
Subject: [PATCH 9/9] Add a short helper method for checking features enabled

---
 app/controllers/application_controller.rb     |  8 +++-
 app/controllers/bioschemas_controller.rb      |  2 +-
 app/controllers/collections_controller.rb     |  2 +-
 app/controllers/communities_controller.rb     |  6 +--
 .../content_providers_controller.rb           |  2 +-
 app/controllers/events_controller.rb          |  2 +-
 .../learning_path_topics_controller.rb        |  2 +-
 app/controllers/learning_paths_controller.rb  |  2 +-
 app/controllers/materials_controller.rb       |  4 +-
 app/controllers/nodes_controller.rb           |  2 +-
 app/controllers/search_controller.rb          | 10 ++---
 app/controllers/spaces_controller.rb          |  2 +-
 app/controllers/static_controller.rb          |  6 +--
 app/controllers/trainers_controller.rb        |  2 +-
 app/controllers/users_controller.rb           |  6 +--
 app/controllers/workflows_controller.rb       |  2 +-
 app/views/about/_about_nav.html.erb           |  2 +-
 app/views/about/_links.html.erb               |  2 +-
 app/views/about/developers.erb                |  8 ++--
 app/views/about/tess.html.erb                 |  6 +--
 app/views/collections/show.html.erb           | 12 +++---
 app/views/content_providers/_form.html.erb    |  2 +-
 .../_content_provider_sidebar.html.erb        |  2 +-
 app/views/content_providers/show.html.erb     |  8 ++--
 app/views/events/_form.html.erb               |  2 +-
 app/views/layouts/_header.html.erb            |  2 +-
 app/views/learning_path_topics/show.html.erb  |  8 ++--
 app/views/learning_paths/_form.html.erb       |  2 +-
 app/views/materials/_form.html.erb            | 38 +++++++++----------
 .../partials/_associated_node_info.html.erb   |  2 +-
 app/views/nodes/show.html.erb                 | 12 +++---
 .../static/home/_catalogue_blocks.html.erb    |  2 +-
 .../static/home/_provider_carousel.html.erb   |  2 +-
 app/views/trainers/index.html.erb             |  2 +-
 app/views/users/_form.html.erb                |  2 +-
 app/views/users/show.html.erb                 | 18 ++++-----
 36 files changed, 98 insertions(+), 96 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a2c25b90d..13fc15d1f 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -96,7 +96,13 @@ def job_status
 
   private
 
-  def feature_enabled?(feature = controller_name)
+  def feature_enabled?(feature)
+    Space.current_space.feature_enabled?(feature)
+  end
+
+  helper_method :feature_enabled?
+
+  def ensure_feature_enabled(feature = controller_name)
     if TeSS::Config.feature.key?(feature) && !TeSS::Config.feature[feature]
       raise ActionController::RoutingError.new('Feature not enabled')
     end
diff --git a/app/controllers/bioschemas_controller.rb b/app/controllers/bioschemas_controller.rb
index d80f2ebd1..dd0719bde 100644
--- a/app/controllers/bioschemas_controller.rb
+++ b/app/controllers/bioschemas_controller.rb
@@ -1,5 +1,5 @@
 class BioschemasController < ApplicationController
-  before_action -> { feature_enabled?('bioschemas_testing') }
+  before_action -> { ensure_feature_enabled('bioschemas_testing') }
 
   def test
 
diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
index 7809339e9..08831832b 100644
--- a/app/controllers/collections_controller.rb
+++ b/app/controllers/collections_controller.rb
@@ -1,6 +1,6 @@
 # The controller for actions related to the Collection model
 class CollectionsController < ApplicationController
-  before_action :feature_enabled?
+  before_action :ensure_feature_enabled
   before_action :set_collection, only: %i[show edit curate update_curation add_item remove_item update destroy]
   before_action :set_breadcrumbs
 
diff --git a/app/controllers/communities_controller.rb b/app/controllers/communities_controller.rb
index 38ec5196b..594a039ef 100644
--- a/app/controllers/communities_controller.rb
+++ b/app/controllers/communities_controller.rb
@@ -8,9 +8,9 @@ def show
     @resources = []
     if TeSS::Config.solr_enabled
       enabled = []
-      enabled.append(Event) if Space.current_space.feature_enabled?('events')
-      enabled.append(Material) if Space.current_space.feature_enabled?('materials')
-      enabled.append(Collection) if Space.current_space.feature_enabled?('collections')
+      enabled.append(Event) if feature_enabled?('events')
+      enabled.append(Material) if feature_enabled?('materials')
+      enabled.append(Collection) if feature_enabled?('collections')
       enabled.each do |resource|
         @resources += resource.search_and_filter(nil, '', { 'max_age' => '1 month' },
                                                  sort_by: 'new', per_page: 5).results
diff --git a/app/controllers/content_providers_controller.rb b/app/controllers/content_providers_controller.rb
index 4897919bc..e287d7d76 100644
--- a/app/controllers/content_providers_controller.rb
+++ b/app/controllers/content_providers_controller.rb
@@ -1,6 +1,6 @@
 # The controller for actions related to the Content Providers model
 class ContentProvidersController < ApplicationController
-  before_action -> { feature_enabled?('content_providers') }
+  before_action :ensure_feature_enabled
   before_action :set_content_provider, only: %i[show edit update destroy]
   before_action :set_breadcrumbs
 
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index 413e78523..40df7990e 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -2,7 +2,7 @@
 
 # The controller for actions related to the Events model
 class EventsController < ApplicationController
-  before_action :feature_enabled?
+  before_action :ensure_feature_enabled
   before_action :set_event, only: %i[show edit clone update destroy update_collections add_term reject_term
                                      redirect report update_report add_data reject_data]
   before_action :set_breadcrumbs
diff --git a/app/controllers/learning_path_topics_controller.rb b/app/controllers/learning_path_topics_controller.rb
index 7489e14fc..62c09fa5a 100644
--- a/app/controllers/learning_path_topics_controller.rb
+++ b/app/controllers/learning_path_topics_controller.rb
@@ -1,5 +1,5 @@
 class LearningPathTopicsController < ApplicationController
-  before_action -> { feature_enabled?('learning_paths') }
+  before_action -> { ensure_feature_enabled('learning_paths') }
   before_action :set_topic, only: %i[show edit update destroy]
   before_action :set_breadcrumbs
 
diff --git a/app/controllers/learning_paths_controller.rb b/app/controllers/learning_paths_controller.rb
index a99105e8d..24d85d9f9 100644
--- a/app/controllers/learning_paths_controller.rb
+++ b/app/controllers/learning_paths_controller.rb
@@ -1,5 +1,5 @@
 class LearningPathsController < ApplicationController
-  before_action :feature_enabled?
+  before_action :ensure_feature_enabled
   before_action :set_learning_path, only: [:show, :edit, :update, :destroy]
   before_action :set_breadcrumbs
 
diff --git a/app/controllers/materials_controller.rb b/app/controllers/materials_controller.rb
index fae541d5a..72806976d 100644
--- a/app/controllers/materials_controller.rb
+++ b/app/controllers/materials_controller.rb
@@ -1,6 +1,6 @@
 # The controller for actions related to the Materials model
 class MaterialsController < ApplicationController
-  before_action :feature_enabled?
+  before_action :ensure_feature_enabled
   before_action :set_material, only: %i[show edit update destroy update_collections clone
                                         add_term reject_term add_data reject_data]
   before_action :set_breadcrumbs
@@ -17,7 +17,7 @@ class MaterialsController < ApplicationController
   # GET /materials.json?q=queryparam
 
   def index
-    elearning = @facet_params[:resource_type] == 'e-learning' && Space.current_space.feature_enabled?('elearning_materials')
+    elearning = @facet_params[:resource_type] == 'e-learning' && feature_enabled?('elearning_materials')
     @bioschemas = @materials.flat_map(&:to_bioschemas)
     respond_to do |format|
       format.html { render elearning ? 'elearning_materials/index' : 'index' }
diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 331a4a8dc..0821d470e 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -1,6 +1,6 @@
 # The controller for actions related to the Nodes model
 class NodesController < ApplicationController
-  before_action :feature_enabled?
+  before_action :ensure_feature_enabled
   before_action :set_node, only: [:show, :edit, :update, :destroy]
   before_action :set_breadcrumbs
 
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index d6d543b0b..a612ad898 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -54,11 +54,11 @@ def search_params
   def search_models
     return @_models if @_models
     @_models = ['User']
-    @_models << 'Event' if Space.current_space.feature_enabled?('events')
-    @_models << 'Material' if Space.current_space.feature_enabled?('materials')
-    @_models << 'Collection' if Space.current_space.feature_enabled?('collections')
-    @_models << 'ContentProvider' if Space.current_space.feature_enabled?('content_providers')
-    @_models << 'Trainer' if Space.current_space.feature_enabled?('trainers')
+    @_models << 'Event' if feature_enabled?('events')
+    @_models << 'Material' if feature_enabled?('materials')
+    @_models << 'Collection' if feature_enabled?('collections')
+    @_models << 'ContentProvider' if feature_enabled?('content_providers')
+    @_models << 'Trainer' if feature_enabled?('trainers')
     @_models
   end
 end
diff --git a/app/controllers/spaces_controller.rb b/app/controllers/spaces_controller.rb
index 0f82b4f16..9de4c6f3c 100644
--- a/app/controllers/spaces_controller.rb
+++ b/app/controllers/spaces_controller.rb
@@ -1,6 +1,6 @@
 # The controller for actions related to the Spaces model
 class SpacesController < ApplicationController
-  before_action :feature_enabled?
+  before_action :ensure_feature_enabled
   before_action :set_space, only: [:show, :edit, :update, :destroy]
   before_action :set_breadcrumbs
 
diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
index 5849d817a..e5b3e5538 100644
--- a/app/controllers/static_controller.rb
+++ b/app/controllers/static_controller.rb
@@ -9,9 +9,9 @@ def home
     @resources = []
     if TeSS::Config.solr_enabled
       enabled = []
-      enabled.append(Event) if Space.current_space.feature_enabled?('events')
-      enabled.append(Material) if Space.current_space.feature_enabled?('materials')
-      enabled.append(Collection) if Space.current_space.feature_enabled?('collections')
+      enabled.append(Event) if feature_enabled?('events')
+      enabled.append(Material) if feature_enabled?('materials')
+      enabled.append(Collection) if feature_enabled?('collections')
       enabled.each do |resource|
         @resources += resource.search_and_filter(nil, '', { 'max_age' => '1 month' },
                                                  sort_by: 'new', per_page: 5).results
diff --git a/app/controllers/trainers_controller.rb b/app/controllers/trainers_controller.rb
index 076086703..4fba487be 100644
--- a/app/controllers/trainers_controller.rb
+++ b/app/controllers/trainers_controller.rb
@@ -1,6 +1,6 @@
 # The controller for actions related to the Profiles model
 class TrainersController < ApplicationController
-  before_action :feature_enabled?
+  before_action :ensure_feature_enabled
   before_action :set_trainer, only: [:show]
   before_action :set_breadcrumbs
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 36a2e73f9..6edf1ec50 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2,7 +2,7 @@
 
 # The controller for actions related to the Users model
 class UsersController < ApplicationController
-  before_action -> { feature_enabled?('invitation') }, only: [:invitees]
+  before_action -> { ensure_feature_enabled('invitation') }, only: [:invitees]
   prepend_before_action :set_user, only: %i[show edit update destroy change_token]
   prepend_before_action :init_user, only: [:create]
   before_action :set_breadcrumbs
@@ -139,10 +139,6 @@ def user_params
     params.require(:user).permit(allowed_parameters)
   end
 
-  def invitees_enabled?
-    feature_enabled?('invitation')
-  end
-
   # Prevent assigning other profiles
   def check_profile_id
     profile_id = @user.profile.id
diff --git a/app/controllers/workflows_controller.rb b/app/controllers/workflows_controller.rb
index 937f1bc2f..2af2055de 100644
--- a/app/controllers/workflows_controller.rb
+++ b/app/controllers/workflows_controller.rb
@@ -1,6 +1,6 @@
 # The controller for actions related to the Workflows model
 class WorkflowsController < ApplicationController
-  before_action :feature_enabled?
+  before_action :ensure_feature_enabled
 
   layout 'application'
 
diff --git a/app/views/about/_about_nav.html.erb b/app/views/about/_about_nav.html.erb
index 2ce1ae21c..55efafdeb 100644
--- a/app/views/about/_about_nav.html.erb
+++ b/app/views/about/_about_nav.html.erb
@@ -24,7 +24,7 @@
   </ul>
 
   <!-- REGISTERING YOUR LEARNING PATHS -->
-  <% if Space.current_space.feature_enabled?('learning_paths') %>
+  <% if feature_enabled?('learning_paths') %>
     <ul class="nav nav-stacked <%= show_active(show, 'learning_paths') %>">
       <li class="about-page-category">
         <%= link_to t('about.sidebar.learning_paths'), registering_learning_paths_path %>
diff --git a/app/views/about/_links.html.erb b/app/views/about/_links.html.erb
index 1374423ef..90e72768f 100644
--- a/app/views/about/_links.html.erb
+++ b/app/views/about/_links.html.erb
@@ -1,7 +1,7 @@
 <div class="quick-links">
   <%= link_to 'What is ' + TeSS::Config.site['title_short'] + '?', about_path, class: ('selected-tab' if show == 'tess') %>
   | <%= link_to 'How to Register', registering_resources_path, class: ('selected-tab' if show == 'registering') %>
-  <% if Space.current_space.feature_enabled?('learning_paths') %>
+  <% if feature_enabled?('learning_paths') %>
     | <%= link_to 'Learning Paths', registering_learning_paths_path, class: ('selected-tab' if show == 'learning_paths') %>
   <% end %>
   | <%= link_to 'Developers Guide', developers_path, class: ('selected-tab' if show == 'developer') %>
diff --git a/app/views/about/developers.erb b/app/views/about/developers.erb
index 8fe1fb509..9ee40c453 100644
--- a/app/views/about/developers.erb
+++ b/app/views/about/developers.erb
@@ -72,7 +72,7 @@
 
         <p>
           <!-- Events -->
-          <% if Space.current_space.feature_enabled?('events') %>
+          <% if feature_enabled?('events') %>
             <code>
               <a href="<%= TeSS::Config.base_url %><%== t 'developer.api_example_1' %>">
                 <%= TeSS::Config.base_url %><%== t 'developer.api_example_1' %></a>
@@ -80,7 +80,7 @@
           <% end %>
 
           <!-- Materials -->
-          <% if Space.current_space.feature_enabled?('materials') %>
+          <% if feature_enabled?('materials') %>
             <code>
               <a href="<%= TeSS::Config.base_url %><%== t 'developer.api_example_3' %>">
                 <%= TeSS::Config.base_url %><%== t 'developer.api_example_3' %> </a>
@@ -88,7 +88,7 @@
           <% end %>
 
           <!-- Providers -->
-          <% if Space.current_space.feature_enabled?('content_providers') %>
+          <% if feature_enabled?('content_providers') %>
             <code>
               <a href="<%= TeSS::Config.base_url %><%== t 'developer.api_example_4' %>">
                 <%= TeSS::Config.base_url %><%== t 'developer.api_example_4' %> </a>
@@ -96,7 +96,7 @@
           <% end %>
 
           <!-- Workflows -->
-          <% if Space.current_space.feature_enabled?('workflows') %>
+          <% if feature_enabled?('workflows') %>
             <code>
               <a href="<%= TeSS::Config.base_url %><%== t 'developer.api_example_5' %>">
                 <%= TeSS::Config.base_url %><%== t 'developer.api_example_5' %> </a>
diff --git a/app/views/about/tess.html.erb b/app/views/about/tess.html.erb
index dbd3b876a..b857d4433 100644
--- a/app/views/about/tess.html.erb
+++ b/app/views/about/tess.html.erb
@@ -38,7 +38,7 @@
       <% @feature_count = 0 %>
 
       <!-- EVENTS-->
-      <% if Space.current_space.feature_enabled?('events') %>
+      <% if feature_enabled?('events') %>
         <div id="events" class="row <%= next_about_block(@feature_count += 1) %>">
           <h3 class="col-lg-12"><%= t('about.headings.events') %></h3>
           <div class="col-lg-2 col-lg-push-10 about-resource-icon">
@@ -59,7 +59,7 @@
       <% end %>
 
       <!-- MATERIALS-->
-      <% if Space.current_space.feature_enabled?('materials') %>
+      <% if feature_enabled?('materials') %>
         <div id="materials" class="row <%= next_about_block(@feature_count += 1) %>">
           <h3 class="col-lg-12"><%= t('about.headings.materials') %></h3>
 
@@ -83,7 +83,7 @@
       <% end %>
 
       <!-- WORKFLOWS -->
-      <% if Space.current_space.feature_enabled?('workflows') %>
+      <% if feature_enabled?('workflows') %>
         <div id="workflows" class="row <%= next_about_block(@feature_count += 1) %>">
           <h3 class="col-lg-12"><%= t('about.headings.workflows') %></h3>
           <div class="col-lg-2 col-lg-push-10 about-resource-icon">
diff --git a/app/views/collections/show.html.erb b/app/views/collections/show.html.erb
index 56f45a783..7b3525c40 100644
--- a/app/views/collections/show.html.erb
+++ b/app/views/collections/show.html.erb
@@ -11,11 +11,11 @@
           <%= render partial: 'collaborations/collaborators_button', locals: { resource: @collection } %>
         <% end %>
         <% if TeSS::Config.feature['collection_curation'] && current_user && policy(@collection).curate? %>
-          <% if Space.current_space.feature_enabled?('events') %>
+          <% if feature_enabled?('events') %>
             <%= link_to t('.curate_events', default: [:'helpers.links.events', 'events']),
                         curate_events_collection_path(@collection), class: 'btn btn-default' %>
           <% end %>
-          <% if Space.current_space.feature_enabled?('materials') %>
+          <% if feature_enabled?('materials') %>
             <%= link_to t('.curate_materials', default: [:'helpers.links.materials', 'materials']),
                         curate_materials_collection_path(@collection), class: 'btn btn-default' %>
           <% end %>
@@ -33,12 +33,12 @@
       <% not_finished_events_count = e.not_finished.count %>
       <% activator = tab_activator %>
       <ul class="nav nav-tabs">
-        <% if Space.current_space.feature_enabled?('materials') %>
+        <% if feature_enabled?('materials') %>
           <%= tab('Materials', icon_class_for_model('materials'), 'materials', activator: activator,
                   disabled: { check: materials_count.zero?, message: 'No registered training materials' },
                   count: materials_count) %>
         <% end %>
-        <% if Space.current_space.feature_enabled?('events') %>
+        <% if feature_enabled?('events') %>
           <%= tab('Events', icon_class_for_model('events'), 'events', activator: activator,
                   disabled: { check: events_count.zero?, message: 'No associated events' },
                   count: not_finished_events_count.zero? && events_count.positive? ? '0*' : not_finished_events_count) %>
@@ -47,7 +47,7 @@
     </div>
 
     <div class="tab-content ml-3">
-      <% if Space.current_space.feature_enabled?('materials') %>
+      <% if feature_enabled?('materials') %>
         <%= render partial: 'common/associated_resources',
                    locals: { model: Material,
                              total_count: materials_count,
@@ -56,7 +56,7 @@
                              view_all_link: materials_path(collections: @collection.title) } %>
       <% end %>
 
-      <% if Space.current_space.feature_enabled?('events') %>
+      <% if feature_enabled?('events') %>
         <%= render partial: 'common/associated_events',
                    locals: { total_count: events_count,
                              resources: event_items,
diff --git a/app/views/content_providers/_form.html.erb b/app/views/content_providers/_form.html.erb
index ca6544ded..eea794785 100644
--- a/app/views/content_providers/_form.html.erb
+++ b/app/views/content_providers/_form.html.erb
@@ -37,7 +37,7 @@
   <%= f.multi_input :keywords %>
 
   <!-- Nodes: check feature enabled -->
-  <% if Space.current_space.feature_enabled?('nodes') %>
+  <% if feature_enabled?('nodes') %>
     <%= f.input :node_id, label: 'ELIXIR node', collection: Node.order(:name).all, label_method: :name %>
   <% end %>
 
diff --git a/app/views/content_providers/partials/_content_provider_sidebar.html.erb b/app/views/content_providers/partials/_content_provider_sidebar.html.erb
index f245f3e9f..cf97b9db3 100644
--- a/app/views/content_providers/partials/_content_provider_sidebar.html.erb
+++ b/app/views/content_providers/partials/_content_provider_sidebar.html.erb
@@ -10,7 +10,7 @@
     <%= content_provider.keywords.join(', ') %>
   </div>
 <% end %>
-<% unless content_provider.node.blank? || !Space.current_space.feature_enabled?('nodes') %>
+<% unless content_provider.node.blank? || !feature_enabled?('nodes') %>
   <h4 class="nav-heading">ELIXIR node</h4>
   <div class="nav-block">
     <p>
diff --git a/app/views/content_providers/show.html.erb b/app/views/content_providers/show.html.erb
index ab4d8b283..96e31006e 100644
--- a/app/views/content_providers/show.html.erb
+++ b/app/views/content_providers/show.html.erb
@@ -32,12 +32,12 @@
       <% sources = @content_provider.sources.order(enabled: :desc, finished_at: :desc) %>
       <% activator = tab_activator %>
       <ul class="nav nav-tabs">
-        <% if Space.current_space.feature_enabled?('materials') %>
+        <% if feature_enabled?('materials') %>
           <%= tab('Materials', icon_class_for_model('materials'), 'materials', activator: activator,
                   disabled: { check: materials_count.zero?, message: 'No registered training materials' },
                   count: materials_count) %>
         <% end %>
-        <% if Space.current_space.feature_enabled?('events') %>
+        <% if feature_enabled?('events') %>
           <%= tab('Events', icon_class_for_model('events'), 'events', activator: activator,
                   disabled: { check: events_count.zero?, message: 'No associated events' },
                   count: not_finished_events_count.zero? && events_count.positive? ? '0*' : not_finished_events_count) %>
@@ -49,7 +49,7 @@
       </ul>
 
       <div class="tab-content">
-        <% if Space.current_space.feature_enabled?('materials') %>
+        <% if feature_enabled?('materials') %>
           <%= render partial: 'common/associated_resources',
                      locals: { model: Material,
                                total_count: materials_count,
@@ -59,7 +59,7 @@
                                view_all_link: materials_path(content_provider: @content_provider.title) } %>
         <% end %>
 
-        <% if Space.current_space.feature_enabled?('events') %>
+        <% if feature_enabled?('events') %>
           <%= render partial: 'common/associated_events',
                      locals: { total_count: upcoming_events.count,
                                past_count: past_events.count,
diff --git a/app/views/events/_form.html.erb b/app/views/events/_form.html.erb
index 80fc6b5ae..96875d3d8 100644
--- a/app/views/events/_form.html.erb
+++ b/app/views/events/_form.html.erb
@@ -157,7 +157,7 @@
   <!-- Fields: that need to be check for enabled/disabled -->
 
   <!-- Nodes: check feature enabled -->
-  <% if Space.current_space.feature_enabled?('nodes') %>
+  <% if feature_enabled?('nodes') %>
     <%= f.dropdown :node_ids, options: format_for_dropdown(Node.order(:name).all), label: 'Nodes',
                    errors: @event.errors[:node_ids] %>
   <% end %>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 4a7ad65b7..52da0aeca 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -54,7 +54,7 @@
             { feature: 'nodes', link: nodes_path },
             { feature: 'spaces', link: spaces_path }
           ].select do |t|
-            t[:feature] == 'about' || Space.current_space.feature_enabled?(t[:feature])
+            t[:feature] == 'about' || feature_enabled?(t[:feature])
           end.sort_by do |t|
             TeSS::Config.site['tab_order'].index(t[:feature]) || 99
           end
diff --git a/app/views/learning_path_topics/show.html.erb b/app/views/learning_path_topics/show.html.erb
index 0a2b88e61..8034a1d48 100644
--- a/app/views/learning_path_topics/show.html.erb
+++ b/app/views/learning_path_topics/show.html.erb
@@ -53,12 +53,12 @@
       <% not_finished_events_count = e.not_finished.count %>
       <% activator = tab_activator %>
       <ul class="nav nav-tabs">
-        <% if Space.current_space.feature_enabled?('materials') %>
+        <% if feature_enabled?('materials') %>
           <%= tab('Materials', icon_class_for_model('materials'), 'materials', activator: activator,
                   disabled: { check: materials_count.zero?, message: 'No registered training materials' },
                   count: materials_count) %>
         <% end %>
-        <% if Space.current_space.feature_enabled?('events') %>
+        <% if feature_enabled?('events') %>
           <%# tab('Events', icon_class_for_model('events'), 'events', activator: activator,
                   disabled: { check: events_count.zero?, message: 'No associated events' },
                   count: not_finished_events_count.zero? && events_count.positive? ? '0*' : not_finished_events_count) %>
@@ -67,7 +67,7 @@
     </div>
 
     <div class="tab-content ml-3">
-      <% if Space.current_space.feature_enabled?('materials') %>
+      <% if feature_enabled?('materials') %>
         <%= render partial: 'common/associated_resources',
                    locals: { model: Material,
                              total_count: materials_count,
@@ -76,7 +76,7 @@
                              view_all_link: materials_path(collections: @learning_path_topic.title) } %>
       <% end %>
 
-      <% if Space.current_space.feature_enabled?('events') %>
+      <% if feature_enabled?('events') %>
         <%= render partial: 'common/associated_events',
                    locals: { total_count: events_count,
                              resources: event_items,
diff --git a/app/views/learning_paths/_form.html.erb b/app/views/learning_paths/_form.html.erb
index 5631be1c9..591faf3c1 100644
--- a/app/views/learning_paths/_form.html.erb
+++ b/app/views/learning_paths/_form.html.erb
@@ -62,7 +62,7 @@
               visibility_toggle: TeSS::Config.feature['learning_paths_disabled'] %>
 
   <!-- Nodes: check feature enabled -->
-  <% if Space.current_space.feature_enabled?('nodes') %>
+  <% if feature_enabled?('nodes') %>
     <%= f.dropdown :node_ids, options: format_for_dropdown(Node.order(:name).all), label: 'Nodes' %>
   <% end %>
 
diff --git a/app/views/materials/_form.html.erb b/app/views/materials/_form.html.erb
index 7518a1ac1..a04522454 100644
--- a/app/views/materials/_form.html.erb
+++ b/app/views/materials/_form.html.erb
@@ -27,84 +27,84 @@
 
   <!-- Field: Resource Type -->
   <%= f.multi_input :resource_type, label: 'Resource types', errors: @material.errors[:resource_type],
-                    title: t('materials.hints.resource_type'), visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
+                    title: t('materials.hints.resource_type'), visibility_toggle: feature_enabled?('materials_disabled') %>
 
   <!-- Field: Scientific Topics -->
   <%= f.autocompleter :scientific_topics, url: edam_topics_path, template: 'autocompleter/term',
                       id_field: :uri, label_field: :preferred_label,
-                      visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
+                      visibility_toggle: feature_enabled?('materials_disabled') %>
 
   <hr>
 
   <!-- Field: Keywords -->
-  <%= f.multi_input :keywords, title: t('materials.hints.keywords'), visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
+  <%= f.multi_input :keywords, title: t('materials.hints.keywords'), visibility_toggle: feature_enabled?('materials_disabled') %>
 
   <!-- Field: Licence -->
   <%= f.input :licence, collection: licence_options_for_select, as: :grouped_select, group_method: :last, group_label_method: :first,
               input_html: { title: t('materials.hints.licence'), class: 'js-select2' },
               prompt: 'Select a licence...', errors: @material.errors[:licence], field_lock: true,
-              visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
+              visibility_toggle: feature_enabled?('materials_disabled') %>
 
   <!-- Field: Status -->
   <%= f.input :status, collection: MaterialStatusDictionary.instance.options_for_select, prompt: 'Select a status...',
               errors: @material.errors[:status], input_html: { title: t('materials.hints.status') },
-              field_lock: true, visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
+              field_lock: true, visibility_toggle: feature_enabled?('materials_disabled') %>
 
   <!-- Field: Contact -->
   <%= f.input :contact, input_html: { rows: '5', title: t('materials.hints.contact') }, field_lock: true,
-              visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
+              visibility_toggle: feature_enabled?('materials_disabled') %>
 
   <!-- Field: DOI -->
   <%= f.input :doi, field_lock: true, input_html: { title: t('materials.hints.doi') },
-              visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
+              visibility_toggle: feature_enabled?('materials_disabled') %>
 
   <!-- Field: Version -->
   <%= f.input :version, input_html: { title: t('materials.hints.version') }, field_lock: true,
-              visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
+              visibility_toggle: feature_enabled?('materials_disabled') %>
 
   <!-- Field: Provider -->
   <%= f.input :content_provider_id, collection: current_user.get_editable_providers, label_method: :title, value_method: :id,
               include_blank: true, field_lock: true, input_html: { title: t('materials.hints.providers') },
-              visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
+              visibility_toggle: feature_enabled?('materials_disabled') %>
 
   <!-- Field: Authors -->
   <%= f.multi_input :authors, suggestions_url: people_autocomplete_suggestions_path, title: t('materials.hints.authors'),
-                    visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
+                    visibility_toggle: feature_enabled?('materials_disabled') %>
 
   <!-- Field: Contributors -->
   <%= f.multi_input :contributors, suggestions_url: people_autocomplete_suggestions_path, title: t('materials.hints.contributors'),
-                    visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
+                    visibility_toggle: feature_enabled?('materials_disabled') %>
 
   <!-- Field: Target Audience -->
   <%= f.multi_input :target_audience, label: 'Target audiences', errors: @material.errors[:target_audience],
-                    title: t('events.hints.targets'), visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
+                    title: t('events.hints.targets'), visibility_toggle: feature_enabled?('materials_disabled') %>
 
   <!-- Field: Prerequisites -->
   <%= f.input :prerequisites, as: :markdown_area, field_lock: true,
               input_html: { rows: '3', title: t('materials.hints.prerequisites') },
-              visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
+              visibility_toggle: feature_enabled?('materials_disabled') %>
 
   <!-- Field: Level -->
   <%= f.input :difficulty_level, collection: DifficultyDictionary.instance.options_for_select,
               label: 'Competency level', prompt: 'Select a difficulty level...', field_lock: true,
               errors: @material.errors[:difficulty_level], input_html: { title: t('materials.hints.difficulty') },
-              visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
+              visibility_toggle: feature_enabled?('materials_disabled') %>
 
   <!-- Field: Learning Objectives-->
   <%= f.input :learning_objectives, as: :markdown_area, field_lock: true,
               input_html: { rows: '3', title: t('materials.hints.objectives') },
-              visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
+              visibility_toggle: feature_enabled?('materials_disabled') %>
 
   <!-- Field: Date Created -->
   <%= f.input :date_created, as: :date_picker, field_lock: true, input_html: { title: t('materials.hints.date_created') },
-              visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
+              visibility_toggle: feature_enabled?('materials_disabled') %>
 
 
   <!-- Field: Dates -->
   <%= f.input :date_modified, as: :date_picker, field_lock: true, input_html: { title: t('materials.hints.date_modified') },
-              visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
+              visibility_toggle: feature_enabled?('materials_disabled') %>
   <%= f.input :date_published, as: :date_picker, field_lock: true, input_html: { title: t('materials.hints.date_published') },
-              visibility_toggle: Space.current_space.feature_enabled?('materials_disabled') %>
+              visibility_toggle: feature_enabled?('materials_disabled') %>
 
   <!-- Field: Other Types -->
   <%= f.input :other_types, input_html: { title: t('materials.hints.other_types') }, field_lock: true,
@@ -120,7 +120,7 @@
               visibility_toggle: TeSS::Config.feature['disabled'] %>
 
   <!-- Nodes: check feature enabled -->
-  <% if Space.current_space.feature_enabled?('nodes') %>
+  <% if feature_enabled?('nodes') %>
     <%= f.dropdown :node_ids, options: format_for_dropdown(Node.order(:name).all), label: 'Nodes' %>
   <% end %>
 
diff --git a/app/views/nodes/partials/_associated_node_info.html.erb b/app/views/nodes/partials/_associated_node_info.html.erb
index d33711970..913762b8d 100644
--- a/app/views/nodes/partials/_associated_node_info.html.erb
+++ b/app/views/nodes/partials/_associated_node_info.html.erb
@@ -3,7 +3,7 @@
 Variable that should be available
 - associated_nodes - an array (or AR collection) of nodes
 %>
-<% if Space.current_space.feature_enabled?('nodes') %>
+<% if feature_enabled?('nodes') %>
   <% if associated_nodes.any? %>
     <%# Content provider  %>
     <h4 class="nav-heading"><%= 'Node'.pluralize(associated_nodes.count) %></h4>
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index 82130d521..6640193fd 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -28,17 +28,17 @@
       <% not_finished_events_count = e.not_finished.count %>
       <% activator = tab_activator %>
       <ul class="nav nav-tabs">
-        <% if Space.current_space.feature_enabled?('materials') %>
+        <% if feature_enabled?('materials') %>
           <%= tab('Materials', icon_class_for_model('materials'), 'materials', activator: activator,
                   disabled: { check: materials_count.zero?, message: 'No registered training materials' },
                   count: materials_count) %>
         <% end %>
-        <% if Space.current_space.feature_enabled?('events') %>
+        <% if feature_enabled?('events') %>
           <%= tab('Events', icon_class_for_model('events'), 'events', activator: activator,
                   disabled: { check: events_count.zero?, message: 'No associated events' },
                   count: not_finished_events_count.zero? && events_count.positive? ? '0*' : not_finished_events_count) %>
         <% end %>
-        <% if Space.current_space.feature_enabled?('content_providers') %>
+        <% if feature_enabled?('content_providers') %>
           <%= tab('Providers', icon_class_for_model('content_providers'), 'content_providers', activator: activator,
                   disabled: { check: content_providers_count.zero?, message: 'No associated content providers' },
                   count: content_providers_count) %>
@@ -46,7 +46,7 @@
       </ul>
 
       <div class="tab-content">
-        <% if Space.current_space.feature_enabled?('materials') %>
+        <% if feature_enabled?('materials') %>
           <%= render partial: 'common/associated_resources',
                      locals: { model: Material,
                                total_count: materials_count,
@@ -56,7 +56,7 @@
                                view_all_link: materials_path(node: @node.name) } %>
         <% end %>
 
-        <% if Space.current_space.feature_enabled?('events') %>
+        <% if feature_enabled?('events') %>
           <%= render partial: 'common/associated_events',
                      locals: { total_count: upcoming_events.count,
                                past_count: past_events.count,
@@ -67,7 +67,7 @@
                                inc_expired_link: events_path(node: @node.name, include_expired: true) } %>
         <% end %>
 
-        <% if Space.current_space.feature_enabled?('content_providers') %>
+        <% if feature_enabled?('content_providers') %>
           <%= render partial: 'common/associated_resources',
                      locals: { model: ContentProvider,
                                total_count: content_providers_count,
diff --git a/app/views/static/home/_catalogue_blocks.html.erb b/app/views/static/home/_catalogue_blocks.html.erb
index 7ed8f10ce..9ccc4b22f 100644
--- a/app/views/static/home/_catalogue_blocks.html.erb
+++ b/app/views/static/home/_catalogue_blocks.html.erb
@@ -1,4 +1,4 @@
-<% features = ['events', 'materials', 'learning_paths', 'trainers'].select { |f| Space.current_space.feature_enabled?(f) } %>
+<% features = ['events', 'materials', 'learning_paths', 'trainers'].select { |f| feature_enabled?(f) } %>
 
 <section id="catalogue">
   <h2 class="text-center"><%= t('home.catalogue.title') %></h2>
diff --git a/app/views/static/home/_provider_carousel.html.erb b/app/views/static/home/_provider_carousel.html.erb
index af76fb9fa..602c93c86 100644
--- a/app/views/static/home/_provider_carousel.html.erb
+++ b/app/views/static/home/_provider_carousel.html.erb
@@ -1,5 +1,5 @@
 <% per_slide = 3 %>
-<% return unless Space.current_space.feature_enabled?('content_providers') %>
+<% return unless feature_enabled?('content_providers') %>
 <% provider_ids = TeSS::Config.site.dig('home_page', 'featured_providers') %>
 <% provider_ids = ContentProvider.from_verified_users.
   where.not(image_file_size: nil).
diff --git a/app/views/trainers/index.html.erb b/app/views/trainers/index.html.erb
index 5830f802d..4200b6a0f 100644
--- a/app/views/trainers/index.html.erb
+++ b/app/views/trainers/index.html.erb
@@ -10,7 +10,7 @@
     <h2><%=t("features.trainers.long")%></h2>
     <% content_for :buttons do %>
       <!-- Register button -->
-      <%= edit_button(current_user, text: t('register.buttons.trainers'), anchor: 'trainer_details') if current_user && policy(current_user).update? && Space.current_space.feature_enabled?('trainers') %>
+      <%= edit_button(current_user, text: t('register.buttons.trainers'), anchor: 'trainer_details') if current_user && policy(current_user).update? && feature_enabled?('trainers') %>
       <!-- Info -->
       <%= info_button("What are trainers in #{TeSS::Config.site['title_short']}?", hide_text: true) do %>
         <%= render_markdown(trainers_info) %>
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index 8ee2e305a..5733354e7 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -43,7 +43,7 @@
           <%= user_f.input :check_broken_scrapers %>
         <% end %>
 
-        <% if Space.current_space.feature_enabled?('trainers') %>
+        <% if feature_enabled?('trainers') %>
           <p><br/>
 
           <h3 id='trainer_details'>Trainer Details</h3>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index b3c46c5f1..a66530955 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -57,7 +57,7 @@
         <% end %>
       </p>
 
-      <% if Space.current_space.feature_enabled?('trainers') %>
+      <% if feature_enabled?('trainers') %>
         <p>
           <strong>Included in Registry of Trainers:</strong>
           <% if @user.profile.public? %>
@@ -145,28 +145,28 @@
 
       <ul class="nav nav-tabs">
         <!-- Tab: Events -->
-        <% if Space.current_space.feature_enabled?('events') %>
+        <% if feature_enabled?('events') %>
           <%= tab('Events', icon_class_for_model('events'), 'events', activator: activator,
                   disabled: { check: events_count.zero?, message: 'No associated events' },
                   count: not_finished_events_count.zero? && events_count.positive? ? '0*' : not_finished_events_count) %>
         <% end %>
 
         <!-- Tab: Materials -->
-        <% if Space.current_space.feature_enabled?('materials') %>
+        <% if feature_enabled?('materials') %>
           <%= tab('Materials', icon_class_for_model('materials'), 'materials', activator: activator,
                   disabled: { check: materials.none?, message: 'No registered training materials' },
                   count: materials_count) %>
         <% end %>
 
         <!-- Tab: Collections -->
-        <% if Space.current_space.feature_enabled?('collections') %>
+        <% if feature_enabled?('collections') %>
           <%= tab('Collections', icon_class_for_model('collections'), 'collections', activator: activator,
                   disabled: { check: collections.none?, message: 'No registered collections' },
                   count: collections_count) %>
         <% end %>
 
         <!-- Tab: Workflows -->
-        <% if Space.current_space.feature_enabled?('workflows') %>
+        <% if feature_enabled?('workflows') %>
           <%= tab('Workflows', icon_class_for_model('workflows'), 'workflows', activator: activator,
                   disabled: { check: workflows.none?, message: 'No workflows' },
                   count: workflows_count) %>
@@ -175,7 +175,7 @@
 
       <div class="tab-content">
         <!-- Tab: Events -->
-        <% if Space.current_space.feature_enabled?('events') %>
+        <% if feature_enabled?('events') %>
           <%= render partial: 'common/associated_events',
                      locals: { total_count: upcoming_events.count,
                                past_count: past_events.count,
@@ -187,7 +187,7 @@
         <% end %>
 
         <!-- Tab: Materials -->
-        <% if Space.current_space.feature_enabled?('materials') %>
+        <% if feature_enabled?('materials') %>
           <%= render partial: 'common/associated_resources',
                      locals: { model: Material,
                                total_count: materials_count,
@@ -198,7 +198,7 @@
         <% end %>
 
         <!-- Tab: Collections -->
-        <% if Space.current_space.feature_enabled?('collections') %>
+        <% if feature_enabled?('collections') %>
           <%= render partial: 'common/associated_resources',
                      locals: { model: Collection,
                                total_count: collections_count,
@@ -209,7 +209,7 @@
         <% end %>
 
         <!-- Tab: Workflows -->
-        <% if Space.current_space.feature_enabled?('workflows') %>
+        <% if feature_enabled?('workflows') %>
           <%= render partial: 'common/associated_resources',
                      locals: { model: Workflow,
                                total_count: workflows_count,