From c66a2cf842cce30e735b66ae7f8ba6abe9764ee2 Mon Sep 17 00:00:00 2001
From: Finn Bacall <finn.bacall@manchester.ac.uk>
Date: Tue, 28 Jul 2026 15:50:52 +0100
Subject: [PATCH 1/3] When viewing resources from another space, show space
 info

On index pages and show page.
---
 app/assets/stylesheets/application.scss        |  1 -
 app/helpers/spaces_helper.rb                   |  8 ++++++++
 app/views/collections/_collection.html.erb     |  1 +
 app/views/collections/show.html.erb            |  1 +
 app/views/common/_space_info.erb               | 18 ++++++++++++++++++
 app/views/events/_event.html.erb               |  1 +
 app/views/events/show.html.erb                 |  1 +
 .../_learning_path_topic.html.erb              |  1 +
 app/views/learning_path_topics/show.html.erb   |  1 +
 .../learning_paths/_learning_path.html.erb     |  1 +
 app/views/learning_paths/show.html.erb         |  1 +
 app/views/materials/_material.html.erb         |  1 +
 app/views/materials/show.html.erb              |  1 +
 app/views/sources/_source.html.erb             |  1 +
 app/views/sources/show.html.erb                |  1 +
 app/views/workflows/_workflow.html.erb         |  1 +
 app/views/workflows/show.html.erb              |  7 +++++++
 config/locales/en.yml                          |  4 +++-
 18 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 app/views/common/_space_info.erb

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 18ed1be58..ad52cc80c 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -138,7 +138,6 @@ div.wrapper {
 
 #content {
   flex-grow: 1;
-  overflow: hidden;
 }
 
 #sidebar {
diff --git a/app/helpers/spaces_helper.rb b/app/helpers/spaces_helper.rb
index 4a57101f3..5bc7dd50c 100644
--- a/app/helpers/spaces_helper.rb
+++ b/app/helpers/spaces_helper.rb
@@ -4,6 +4,14 @@ def spaces_info
     I18n.t('info.spaces.description')
   end
 
+  def space_tag(resource)
+    if TeSS::Config.feature['spaces'] && resource.space && !resource.space.default? && resource.space != current_space
+      content_tag(:span, class: 'label label-info space-tag', style: 'position: absolute; right: -5px; top: -5px;') do
+        content_tag(:i, '', class: 'fa fa-share-square') + ' ' + resource.space.title
+      end
+    end
+  end
+
   def space_feature_options
     Space::FEATURES.select do |f|
       TeSS::Config.feature[f]
diff --git a/app/views/collections/_collection.html.erb b/app/views/collections/_collection.html.erb
index b757b5ffb..e01bb5a6a 100644
--- a/app/views/collections/_collection.html.erb
+++ b/app/views/collections/_collection.html.erb
@@ -1,4 +1,5 @@
 <li class="masonry-brick media-item long">
+  <%= space_tag(collection) %>
   <%= link_to collection, class: 'link-overlay' do %>
     <h4><%= title_with_privacy(collection) %></h4>
 
diff --git a/app/views/collections/show.html.erb b/app/views/collections/show.html.erb
index 7b3525c40..7dda504a3 100644
--- a/app/views/collections/show.html.erb
+++ b/app/views/collections/show.html.erb
@@ -1,5 +1,6 @@
 <div class="wrapper collapsing-wrapper">
   <div class="collapsing-sidebar" id="sidebar">
+    <%= render partial: 'common/space_info', locals: { resource: @collection } %>
     <%= render partial: 'collections/partials/collection_info', locals: { collection: @collection } %>
   </div>
 
diff --git a/app/views/common/_space_info.erb b/app/views/common/_space_info.erb
new file mode 100644
index 000000000..521f756c9
--- /dev/null
+++ b/app/views/common/_space_info.erb
@@ -0,0 +1,18 @@
+<% space = resource.space %>
+<% if TeSS::Config.feature['spaces'] && space && !space.default? && space != current_space %>
+  <% theme_colour = TeSS::Config.themes[space.theme]&.dig('primary') %>
+  <h4 class="nav-heading"><%= Space.model_name.human %></h4>
+  <div class="nav-block" id="space-info">
+    <p>
+      <%= link_to(image_tag(get_image_url_for(space), class: 'medium-avatar', style: (theme_colour ? "background-color: #{theme_colour}" : nil)), space.url, target: :_blank) %>
+    </p>
+
+    <p>
+      <%= link_to space.title, space.url, class: 'h5', target: :_blank %>
+    </p>
+
+    <p>
+      <%= external_link_button t('other_space.link'), polymorphic_url(resource, host: space.host) %>
+    </p>
+  </div>
+<% end %>
diff --git a/app/views/events/_event.html.erb b/app/views/events/_event.html.erb
index ce6c72eb1..8bf1fd2b0 100644
--- a/app/views/events/_event.html.erb
+++ b/app/views/events/_event.html.erb
@@ -1,6 +1,7 @@
 <% learning_path_topic_item ||= nil %>
 <% collection_item ||= learning_path_topic_item %>
 <li class="masonry-brick media-item long">
+  <%= space_tag(event) %>
   <%= link_to event, class: 'link-overlay with-left-icon' do %>
     <%= item_order_badge(collection_item) if collection_item %>
     <div class="with-left-icon">
diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
index c760c1e26..e263ed2b8 100644
--- a/app/views/events/show.html.erb
+++ b/app/views/events/show.html.erb
@@ -2,6 +2,7 @@
   <%# SIDEBAR %>
   <div class="collapsing-sidebar" id="sidebar">
     <%= render partial: 'common/origin_info', locals: { resource: @event } %>
+    <%= render partial: 'common/space_info', locals: { resource: @event } %>
     <%= render partial: 'content_providers/partials/content_provider_info', locals: { content_provider: @event.content_provider } %>
     <%= render partial: "nodes/partials/associated_node_info", locals: { associated_nodes: @event.associated_nodes } %>
     <%= render(partial: 'users/partials/user_info', locals: { user: @event.user }) if current_user.try(:is_admin?) %>
diff --git a/app/views/learning_path_topics/_learning_path_topic.html.erb b/app/views/learning_path_topics/_learning_path_topic.html.erb
index 66ffe4523..6ec01f955 100644
--- a/app/views/learning_path_topics/_learning_path_topic.html.erb
+++ b/app/views/learning_path_topics/_learning_path_topic.html.erb
@@ -1,4 +1,5 @@
 <li class="masonry-brick media-item long">
+  <%= space_tag(learning_path_topic) %>
   <%= link_to learning_path_topic, class: 'link-overlay' do %>
     <div class="masonry-brick-heading">
         <h4><%= learning_path_topic.title %></h4>
diff --git a/app/views/learning_path_topics/show.html.erb b/app/views/learning_path_topics/show.html.erb
index 8d151812e..28737a6cc 100644
--- a/app/views/learning_path_topics/show.html.erb
+++ b/app/views/learning_path_topics/show.html.erb
@@ -1,5 +1,6 @@
 <div class="wrapper collapsing-wrapper">
   <div class="collapsing-sidebar" id="sidebar">
+    <%= render partial: 'common/space_info', locals: { resource: @learning_path_topic } %>
     <h4 class="nav-heading"><%= LearningPathTopic.model_name.human %></h4>
     <div class="nav-block">
       <h5>
diff --git a/app/views/learning_paths/_learning_path.html.erb b/app/views/learning_paths/_learning_path.html.erb
index 5bc24ec77..c3240fc54 100644
--- a/app/views/learning_paths/_learning_path.html.erb
+++ b/app/views/learning_paths/_learning_path.html.erb
@@ -1,5 +1,6 @@
 <% cache(learning_path, expires_in: 1.hour) do %>
   <li class="masonry-brick media-item large block-item learning-path-bg-<%= (learning_path.id % 4) + 1 -%>">
+    <%= space_tag(learning_path) %>
     <%= link_to learning_path, class: 'link-overlay' do %>
       <%= item_order_badge(collection_item) if defined? collection_item %>
 
diff --git a/app/views/learning_paths/show.html.erb b/app/views/learning_paths/show.html.erb
index c7a402e7a..905846293 100644
--- a/app/views/learning_paths/show.html.erb
+++ b/app/views/learning_paths/show.html.erb
@@ -1,5 +1,6 @@
 <div class="wrapper collapsing-wrapper">
   <div class="collapsing-sidebar" id="sidebar">
+    <%= render partial: 'common/space_info', locals: { resource: @learning_path } %>
     <%= render partial: 'content_providers/partials/content_provider_info', locals: { content_provider: @learning_path.content_provider } %>
     <%= render partial: 'nodes/partials/associated_node_info', locals: { associated_nodes: @learning_path.associated_nodes } %>
     <%= render(partial: 'users/partials/user_info', locals: { user: @learning_path.user }) if current_user.try(:is_admin?) %>
diff --git a/app/views/materials/_material.html.erb b/app/views/materials/_material.html.erb
index 3e1b40bcd..154116419 100644
--- a/app/views/materials/_material.html.erb
+++ b/app/views/materials/_material.html.erb
@@ -7,6 +7,7 @@
   end
 %>
 <li class="masonry-brick media-item long">
+  <%= space_tag(material) %>
   <%= link_to material_path(material, **link_params), class: 'link-overlay' do %>
     <%= item_order_badge(collection_item) if show_order && collection_item %>
 
diff --git a/app/views/materials/show.html.erb b/app/views/materials/show.html.erb
index 0cd525900..845806bd6 100644
--- a/app/views/materials/show.html.erb
+++ b/app/views/materials/show.html.erb
@@ -4,6 +4,7 @@
                locals: { topic_link: @learning_path_topic_link,
                          topic_item: @learning_path_topic_item } if @learning_path_topic_link && @learning_path_topic_item %>
     <%= render partial: 'common/origin_info', locals: { resource: @material } %>
+    <%= render partial: 'common/space_info', locals: { resource: @material } %>
     <%= render partial: 'content_providers/partials/content_provider_info', locals: { content_provider: @material.content_provider } %>
     <%= render partial: 'nodes/partials/associated_node_info', locals: { associated_nodes: @material.associated_nodes } %>
     <%= render(partial: 'users/partials/user_info', locals: { user: @material.user }) if current_user.try(:is_admin?) %>
diff --git a/app/views/sources/_source.html.erb b/app/views/sources/_source.html.erb
index 141629ee5..6571932d2 100644
--- a/app/views/sources/_source.html.erb
+++ b/app/views/sources/_source.html.erb
@@ -1,4 +1,5 @@
 <div class="masonry-brick media-item long">
+  <%= space_tag(source) %>
   <%= link_to source, class: 'link-overlay' do %>
     <h4>
       <%= source.title %>
diff --git a/app/views/sources/show.html.erb b/app/views/sources/show.html.erb
index 6ea54afe3..22c6ebbf0 100644
--- a/app/views/sources/show.html.erb
+++ b/app/views/sources/show.html.erb
@@ -2,6 +2,7 @@
 
   <%# SIDEBAR %>
   <div class="collapsing-sidebar" id="sidebar">
+    <%= render partial: 'common/space_info', locals: { resource: @source } %>
     <%= render partial: "content_providers/partials/content_provider_info",
                locals: { content_provider: @source.content_provider } %>
   </div>
diff --git a/app/views/workflows/_workflow.html.erb b/app/views/workflows/_workflow.html.erb
index a5b42e18a..81664d985 100644
--- a/app/views/workflows/_workflow.html.erb
+++ b/app/views/workflows/_workflow.html.erb
@@ -1,4 +1,5 @@
 <li class="masonry-brick media-item long">
+  <%= space_tag(workflow) %>
   <%= link_to workflow, class: 'link-overlay' do %>
     <div class="masonry-brick-heading">
       <div class="masonry-icons">
diff --git a/app/views/workflows/show.html.erb b/app/views/workflows/show.html.erb
index d49b146b6..4689f530e 100644
--- a/app/views/workflows/show.html.erb
+++ b/app/views/workflows/show.html.erb
@@ -27,6 +27,13 @@
           <p class="muted">No description provided</p>
         <% end %>
         <%= render partial: 'common/extra_metadata', locals: { resource: @workflow } %>
+        <% space = @workflow.space %>
+        <% if TeSS::Config.feature['spaces'] && space && !space.default? && space != current_space %>
+          <p class="space no-spacing">
+            <strong class="text-primary"><%= Space.model_name.human %>: </strong>
+            <%= link_to(space.title, space) %>
+          </p>
+        <% end %>
         <% if policy(@workflow).update? && @workflow.edit_suggestion %>
           <%= render partial: 'common/approve_term_suggestions', locals: { suggestion: @workflow.edit_suggestion } %>
         <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7d1a688b3..5d7822cef 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1192,4 +1192,6 @@ en:
   exchange:
     title: Original entry
     info: "This %{resource_type} originated from another TeSS registry. For complete, up-to-date information, please visit the original entry:"
-    link: Go to original entry
\ No newline at end of file
+    link: Go to original entry
+  other_space:
+    link: View in space
\ No newline at end of file

From 93dabd6cd8d3ecf9d3ce27203103dd136724a50a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 28 Jul 2026 15:32:59 +0000
Subject: [PATCH 2/3] Add tests for space info display in materials controller

---
 test/controllers/materials_controller_test.rb | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/test/controllers/materials_controller_test.rb b/test/controllers/materials_controller_test.rb
index 07f1d1b14..c667f058c 100644
--- a/test/controllers/materials_controller_test.rb
+++ b/test/controllers/materials_controller_test.rb
@@ -1721,4 +1721,46 @@ class MaterialsControllerTest < ActionController::TestCase
 
     assert_select '#origin-info a[href=?]', uri
   end
+
+  # Space info tests
+  test 'should show space info when viewing a material from a different non-default space' do
+    plant_space_material = materials(:plant_space_material)
+    with_settings(feature: { spaces: true }) do
+      # Request comes from the default space (no specific host)
+      get :show, params: { id: plant_space_material }
+      assert_response :success
+      assert_select '#space-info', count: 1
+      assert_select '#space-info a', text: plant_space_material.space.title
+    end
+  end
+
+  test 'should not show space info when viewing a material from the current space' do
+    plant_space = spaces(:plants)
+    plant_space_material = materials(:plant_space_material)
+    with_settings(feature: { spaces: true }) do
+      with_host(plant_space.host) do
+        get :show, params: { id: plant_space_material }
+        assert_response :success
+        assert_select '#space-info', count: 0
+      end
+    end
+  end
+
+  test 'should not show space info when spaces feature is disabled' do
+    plant_space_material = materials(:plant_space_material)
+    with_settings(feature: { spaces: false }) do
+      get :show, params: { id: plant_space_material }
+      assert_response :success
+      assert_select '#space-info', count: 0
+    end
+  end
+
+  test 'should not show space info when material has no space' do
+    with_settings(feature: { spaces: true }) do
+      # @material has no space assigned
+      get :show, params: { id: @material }
+      assert_response :success
+      assert_select '#space-info', count: 0
+    end
+  end
 end

From 4fc6764c1045cd522778a87313ff6420137e6eea Mon Sep 17 00:00:00 2001
From: Finn Bacall <finn.bacall@manchester.ac.uk>
Date: Fri, 31 Jul 2026 13:36:22 +0100
Subject: [PATCH 3/3] Exclude space tag from cache

---
 app/views/learning_paths/_learning_path.html.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/learning_paths/_learning_path.html.erb b/app/views/learning_paths/_learning_path.html.erb
index c3240fc54..7b46d22a1 100644
--- a/app/views/learning_paths/_learning_path.html.erb
+++ b/app/views/learning_paths/_learning_path.html.erb
@@ -1,6 +1,6 @@
-<% cache(learning_path, expires_in: 1.hour) do %>
-  <li class="masonry-brick media-item large block-item learning-path-bg-<%= (learning_path.id % 4) + 1 -%>">
-    <%= space_tag(learning_path) %>
+<li class="masonry-brick media-item large block-item learning-path-bg-<%= (learning_path.id % 4) + 1 -%>">
+  <%= space_tag(learning_path) %>
+  <% cache(learning_path, expires_in: 1.hour) do %>
     <%= link_to learning_path, class: 'link-overlay' do %>
       <%= item_order_badge(collection_item) if defined? collection_item %>
 
@@ -41,6 +41,6 @@
 
       <%= item_comment(collection_item) if defined? collection_item %>
     <% end %>
-  </li>
-<% end %>
+  <% end %>
+</li>