From d2deab435f5fce8d23252329d1dd1f9f9fb0a62e Mon Sep 17 00:00:00 2001
From: baarkerlounger <db@slothlife.xyz>
Date: Thu, 26 May 2022 15:48:26 +0100
Subject: [PATCH] Consistent page titles

---
 app/views/layouts/organisations.html.erb | 8 +++-----
 app/views/organisations/show.html.erb    | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/views/layouts/organisations.html.erb b/app/views/layouts/organisations.html.erb
index c7c3ff2db..cb4d1c716 100644
--- a/app/views/layouts/organisations.html.erb
+++ b/app/views/layouts/organisations.html.erb
@@ -1,11 +1,9 @@
 <% content_for :content do %>
   <h1 class="govuk-heading-l">
-    <% if current_user.support? %>
-        <span class="govuk-caption-l"><%= @organisation.name %></span>
-        <%= content_for(:title) %>
-    <% else %>
-        Your organisation <%= content_for(:title) %>
+    <% if current_user.support? && request.path != "/organisations" %>
+      <span class="govuk-caption-l"><%= @organisation.name %></span>
     <% end %>
+    <%= content_for(:title) %>
   </h1>
 
   <% items = tab_items(current_user) %>
diff --git a/app/views/organisations/show.html.erb b/app/views/organisations/show.html.erb
index 0d726848d..f4760a7c9 100644
--- a/app/views/organisations/show.html.erb
+++ b/app/views/organisations/show.html.erb
@@ -1,4 +1,4 @@
-<% content_for :title, current_user.support? ? "Details" : "Your organisation (Details)" %>
+<% content_for :title, current_user.support? ? "Details" : "Your organisation" %>
 
 <% content_for :tab_title do %>
   <%= "Details" %>