From bea2e02fa56d0cd874816a5fa421a9a4e1b2ad8a Mon Sep 17 00:00:00 2001 From: Sebastian Serth Date: Wed, 13 Sep 2023 04:33:31 +0200 Subject: [PATCH] Show Pair Programming modal for new Programming Groups --- app/assets/javascripts/programming_groups.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/programming_groups.js b/app/assets/javascripts/programming_groups.js index 8b9d2cba..fc336e15 100644 --- a/app/assets/javascripts/programming_groups.js +++ b/app/assets/javascripts/programming_groups.js @@ -18,7 +18,11 @@ $(document).on('turbolinks:load', function () { if (modal.isPresent()) { ProgrammingGroups.initializeEventHandler(); - if (ProgrammingGroups.getStoredViewedPPInfo() !== 'true' && !_.isEqual(current_user, current_contributor)) { + // We only show the modal if the user has not decided to hide it on the current device. + // Further, the modal is either shown on /implement for a programming group or on /programming_groups/new. + if (ProgrammingGroups.getStoredViewedPPInfo() !== 'true' && + ((window.location.pathname.includes('/implement') && !_.isEqual(current_user, current_contributor)) || + window.location.pathname.includes('/programming_groups/new'))) { new bootstrap.Modal(modal).show(); } }