mirror of
https://github.com/iv-org/invidious
synced 2024-11-09 01:10:27 +00:00
Set query as an alias for search query in search
This commit is contained in:
parent
58c4700bde
commit
7729d6496e
@ -40,6 +40,7 @@ class Invidious::Routes::Search < Invidious::Routes::BaseRoute
|
||||
|
||||
query = env.params.query["search_query"]?
|
||||
query ||= env.params.query["q"]?
|
||||
query ||= env.params.query["query"]?
|
||||
|
||||
if !query || query.empty?
|
||||
# Display the full page search box implemented in #1977
|
||||
|
@ -1,4 +1,5 @@
|
||||
<% is_channel_search = operators.fetch("channel", false) && channel.is_a? AboutChannel && !subscriptions.nil?%>
|
||||
<% filter_params = nil %>
|
||||
|
||||
<% content_for "header" do %>
|
||||
<link rel="stylesheet" href="/css/search.css?v=<%= ASSET_COMMIT %>">
|
||||
@ -22,6 +23,7 @@
|
||||
<% end %>
|
||||
|
||||
<% if is_channel_search %>
|
||||
<% filter_params = "&channel=#{operators.fetch("channel", "")}" %>
|
||||
<% else %>
|
||||
<%= rendered "components/search-filters/search-filters" %>
|
||||
<% end %>
|
||||
@ -36,7 +38,7 @@
|
||||
<div class="pure-g h-box v-box">
|
||||
<div class="pure-u-1 pure-u-lg-1-5">
|
||||
<% if page > 1 %>
|
||||
<a href="/search?q=<%= HTML.escape(query.not_nil!) %>&page=<%= page - 1 %>">
|
||||
<a href="/search?q=<%= HTML.escape(query.not_nil!) %>&page=<%= page - 1 %><%=filter_params%>">
|
||||
<%= translate(locale, "Previous page") %>
|
||||
</a>
|
||||
<% end %>
|
||||
@ -44,7 +46,7 @@
|
||||
<div class="pure-u-1 pure-u-lg-3-5"></div>
|
||||
<div class="pure-u-1 pure-u-lg-1-5" style="text-align:right">
|
||||
<% if count >= 20 %>
|
||||
<a href="/search?q=<%= HTML.escape(query.not_nil!) %>&page=<%= page + 1 %>">
|
||||
<a href="/search?q=<%= HTML.escape(query.not_nil!) %>&page=<%= page + 1 %><%=filter_params%>">
|
||||
<%= translate(locale, "Next page") %>
|
||||
</a>
|
||||
<% end %>
|
||||
@ -62,7 +64,7 @@
|
||||
<div class="pure-g h-box">
|
||||
<div class="pure-u-1 pure-u-lg-1-5">
|
||||
<% if page > 1 %>
|
||||
<a href="/search?q=<%= HTML.escape(query.not_nil!) %>&page=<%= page - 1 %>">
|
||||
<a href="/search?q=<%= HTML.escape(query.not_nil!) %>&page=<%= page - 1 %><%=filter_params%>">
|
||||
<%= translate(locale, "Previous page") %>
|
||||
</a>
|
||||
<% end %>
|
||||
@ -70,7 +72,7 @@
|
||||
<div class="pure-u-1 pure-u-lg-3-5"></div>
|
||||
<div class="pure-u-1 pure-u-lg-1-5" style="text-align:right">
|
||||
<% if count >= 20 %>
|
||||
<a href="/search?q=<%= HTML.escape(query.not_nil!) %>&page=<%= page + 1 %>">
|
||||
<a href="/search?q=<%= HTML.escape(query.not_nil!) %>&page=<%= page + 1 %><%=filter_params%>">
|
||||
<%= translate(locale, "Next page") %>
|
||||
</a>
|
||||
<% end %>
|
||||
|
Loading…
Reference in New Issue
Block a user