mirror of
https://github.com/docusealco/docuseal.git
synced 2026-08-07 07:14:43 +00:00
default order if countless
This commit is contained in:
@@ -55,11 +55,10 @@ class TemplateFoldersController < ApplicationController
|
||||
|
||||
def selected_order
|
||||
@selected_order ||=
|
||||
if cookies.permanent[:dashboard_templates_order].blank? ||
|
||||
(cookies.permanent[:dashboard_templates_order] == 'used_at' && can?(:manage, :countless))
|
||||
if can?(:manage, :countless)
|
||||
'created_at'
|
||||
else
|
||||
cookies.permanent[:dashboard_templates_order]
|
||||
cookies.permanent[:dashboard_templates_order].presence || 'created_at'
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -102,11 +102,10 @@ class TemplatesDashboardController < ApplicationController
|
||||
|
||||
def selected_order
|
||||
@selected_order ||=
|
||||
if cookies.permanent[:dashboard_templates_order].blank? ||
|
||||
(cookies.permanent[:dashboard_templates_order] == 'used_at' && can?(:manage, :countless))
|
||||
if can?(:manage, :countless)
|
||||
'created_at'
|
||||
else
|
||||
cookies.permanent[:dashboard_templates_order]
|
||||
cookies.permanent[:dashboard_templates_order].presence || 'created_at'
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -54,8 +54,8 @@
|
||||
<%= render partial: 'templates/template', collection: @templates %>
|
||||
</div>
|
||||
<% templates_order_select_html = capture do %>
|
||||
<% if params[:q].blank? && @pagy.pages > 1 %>
|
||||
<%= render 'shared/templates_order_select', with_recently_used: @pagy.count.present? && @pagy.count < 10_000 && !can?(:manage, :countless), selected_order: %>
|
||||
<% 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, selected_order: %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<%= render 'shared/pagination', pagy: @pagy, items_name: @templates.present? ? 'templates' : 'template_folders', right_additional_html: templates_order_select_html %>
|
||||
|
||||
@@ -45,8 +45,8 @@
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% templates_order_select_html = capture do %>
|
||||
<% if params[:q].blank? && @pagy.pages > 1 %>
|
||||
<%= render 'shared/templates_order_select', with_recently_used: @pagy.count.present? && @pagy.count < 10_000 && !can?(:manage, :countless), selected_order: %>
|
||||
<% 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, selected_order: %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% if @template_folders.present? || @show_default_folder || @show_shared_folder %>
|
||||
|
||||
Reference in New Issue
Block a user