Merge branch 'main' of github.com:adrienpoly/rubyvideo

adrienpoly · Jan 8, 2025 · 4d98815 · 4d98815
2 parents 5a988b0 + 42083c8
commit 4d98815
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -5,6 +5,13 @@ def back_path
     @back_path || root_path
   end
 
+  def back_to_from_request
+    # remove the back_to params from the query string to avoid creating recusive redirects
+    uri = URI.parse(request.fullpath)
+    uri.query = uri.query&.split("&")&.reject { |param| param.start_with?("back_to=") }&.join("&")
+    uri.to_s
+  end
+
   def active_link_to(text = nil, path = nil, active_class: "", **options, &)
     path ||= text
 

diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
@@ -12,7 +12,7 @@
                 locals: {
                   favoritable: true,
                   user_favorite_talks_ids: @user_favorite_talks_ids,
-                  back_to: request.fullpath,
+                  back_to: back_to_from_request,
                   back_to_title: @event.name
                 },
                 as: :talk %>

diff --git a/app/views/speakers/show.html.erb b/app/views/speakers/show.html.erb
@@ -6,7 +6,7 @@
 
   <% if @topics.any? %>
     <div class="mt-9 mb-3">
-      <%= render partial: "topics/badge_list", locals: {topics: @topics, back_to_url: request.fullpath, back_to_title: @speaker.name} %>
+      <%= render partial: "topics/badge_list", locals: {topics: @topics, back_to_url: back_to_from_request, back_to_title: @speaker.name} %>
     </div>
   <% end %>
 
@@ -25,7 +25,7 @@
                   favoritable: true,
                   user_favorite_talks_ids: @user_favorite_talks_ids,
                   watched_talks_ids: user_watched_talks_ids,
-                  back_to: request.fullpath,
+                  back_to: back_to_from_request,
                   back_to_title: @speaker.name
                 } %>
         </div>

diff --git a/app/views/talks/_talk.html.erb b/app/views/talks/_talk.html.erb
@@ -259,7 +259,7 @@
     <% end %>
 
     <% if talk.approved_topics.any? %>
-      <%= render partial: "topics/badge_list", locals: {topics: talk.approved_topics, back_to_url: request.fullpath, back_to_title: talk.title} %>
+      <%= render partial: "topics/badge_list", locals: {topics: talk.approved_topics, back_to_url: back_to_from_request, back_to_title: talk.title} %>
     <% end %>
 
     <div role="tablist" class="tabs tabs-bordered mt-6">

diff --git a/app/views/talks/index.html.erb b/app/views/talks/index.html.erb
@@ -17,7 +17,7 @@
             locals: {
               favoritable: true,
               user_favorite_talks_ids: @user_favorite_talks_ids,
-              back_to: request.fullpath
+              back_to: back_to_from_request
             } %>
     </div>
     <div class="flex mt-4 w-full">

diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb
@@ -18,7 +18,7 @@
             favoritable: true,
             user_favorite_talks_ids: @user_favorite_talks_ids,
             watched_talks_ids: user_watched_talks_ids,
-            back_to: request.fullpath,
+            back_to: back_to_from_request,
             back_to_title: @topic.name
           } %>
   </div>