Skip to content

Commit 7da3058

Browse files
authored
Merge pull request #4641 from nhsuk/fix-duplicate-session-activity-tabs
Ensure "Session activity and notes" only shows once
2 parents 957ce31 + a2e1212 commit 7da3058

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

app/views/patient_sessions/_header.html.erb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@
7171
selected: @programme == programme,
7272
ticked: @patient.vaccination_status(programme:, academic_year: @academic_year).vaccinated?,
7373
)
74-
75-
nav.with_item(
76-
href: session_patient_activity_path(@session, @patient, return_to: params[:return_to]),
77-
text: "Session activity and notes",
78-
selected: request.path.ends_with?("/activity"),
79-
)
8074
end
75+
76+
nav.with_item(
77+
href: session_patient_activity_path(@session, @patient, return_to: params[:return_to]),
78+
text: "Session activity and notes",
79+
selected: request.path.ends_with?("/activity"),
80+
)
8181
end %>
8282
<% end %>

spec/features/doubles_vaccination_administered_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ def when_i_go_to_a_patient_that_is_ready_to_vaccinate
6464
sign_in @nurse
6565
visit session_record_path(@session)
6666
click_link @patient.full_name
67+
68+
expect(page).to have_content("Session activity and notes").once
6769
end
6870

6971
def then_i_see_the_menacwy_vaccination_form

0 commit comments

Comments
 (0)