didadmin/docuseal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

default order if countless

Browse Source
This commit is contained in:
Pete Matsyburka
2026-06-24 22:39:58 +03:00
parent b2790776ef
commit 3c0f1c2e73
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/template_folders_controller.rb
+2 -3
View File
@@ -55,11 +55,10 @@ class TemplateFoldersController < ApplicationController
def selected_order def selected_order
@selected_order ||= @selected_order ||=
if cookies.permanent[:dashboard_templates_order].blank? || if can?(:manage, :countless)
(cookies.permanent[:dashboard_templates_order] == 'used_at' && can?(:manage, :countless))
'created_at' 'created_at'
else else
cookies.permanent[:dashboard_templates_order] cookies.permanent[:dashboard_templates_order].presence || 'created_at'
end end
end end
app/controllers/templates_dashboard_controller.rb
+2 -3
View File
@@ -102,11 +102,10 @@ class TemplatesDashboardController < ApplicationController
def selected_order def selected_order
@selected_order ||= @selected_order ||=
if cookies.permanent[:dashboard_templates_order].blank? || if can?(:manage, :countless)
(cookies.permanent[:dashboard_templates_order] == 'used_at' && can?(:manage, :countless))
'created_at' 'created_at'
else else
cookies.permanent[:dashboard_templates_order] cookies.permanent[:dashboard_templates_order].presence || 'created_at'
end end
end end
app/views/template_folders/show.html.erb
+2 -2
View File
@@ -54,8 +54,8 @@
<%= render partial: 'templates/template', collection: @templates %> <%= render partial: 'templates/template', collection: @templates %>
</div> </div>
<% templates_order_select_html = capture do %> <% templates_order_select_html = capture do %>
<% if params[:q].blank? && @pagy.pages > 1 %> <% if params[:q].blank? && @pagy.pages > 1 && !can?(:manage, :countless) %>
<%= render 'shared/templates_order_select', with_recently_used: @pagy.count.present? && @pagy.count < 10_000 && !can?(:manage, :countless), selected_order: %> <%= render 'shared/templates_order_select', with_recently_used: @pagy.count.present? && @pagy.count < 10_000, selected_order: %>
<% end %> <% end %>
<% end %> <% end %>
<%= render 'shared/pagination', pagy: @pagy, items_name: @templates.present? ? 'templates' : 'template_folders', right_additional_html: templates_order_select_html %> <%= render 'shared/pagination', pagy: @pagy, items_name: @templates.present? ? 'templates' : 'template_folders', right_additional_html: templates_order_select_html %>
app/views/templates_dashboard/index.html.erb
+2 -2
View File
@@ -45,8 +45,8 @@
<% end %> <% end %>
<% end %> <% end %>
<% templates_order_select_html = capture do %> <% templates_order_select_html = capture do %>
<% if params[:q].blank? && @pagy.pages > 1 %> <% if params[:q].blank? && @pagy.pages > 1 && !can?(:manage, :countless) %>
<%= render 'shared/templates_order_select', with_recently_used: @pagy.count.present? && @pagy.count < 10_000 && !can?(:manage, :countless), selected_order: %> <%= render 'shared/templates_order_select', with_recently_used: @pagy.count.present? && @pagy.count < 10_000, selected_order: %>
<% end %> <% end %>
<% end %> <% end %>
<% if @template_folders.present? || @show_default_folder || @show_shared_folder %> <% if @template_folders.present? || @show_default_folder || @show_shared_folder %>