Merge branch 'pull/5297'

This commit is contained in:
Anton Khorev 2024-11-18 18:15:25 +03:00
commit a25b7953b3
4 changed files with 55 additions and 1 deletions

View file

@ -18,12 +18,13 @@ class NotesController < ApplicationController
def index
param! :page, Integer, :min => 1
@params = params.permit(:display_name)
@params = params.permit(:display_name, :status)
@title = t ".title", :user => @user.display_name
@page = (params[:page] || 1).to_i
@page_size = 10
@notes = @user.notes
@notes = @notes.visible unless current_user&.moderator?
@notes = @notes.where(:status => params[:status]) unless params[:status] == "all" || params[:status].blank?
@notes = @notes.order("updated_at DESC, id").distinct.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author)
render :layout => "site"

View file

@ -6,6 +6,20 @@
:commented => tag.span(t(".subheading_commented"), :class => "px-2 py-1 bg-body") %></p>
<% end %>
<%= form_with :url => user_notes_path(@user), :method => :get, :data => { :turbo => true } do %>
<div class="row gx-2 align-items-end">
<div class="col-sm-auto mb-3">
<%= label_tag :status, t(".status") %>
<%= select_tag :status,
options_for_select([[t(".all"), "all"], [t(".open"), "open"], [t(".closed"), "closed"]], params[:status] || "all"),
:class => "form-select" %>
</div>
<div class="col-sm-auto mb-3">
<%= submit_tag t(".apply"), :name => nil, :class => "btn btn-primary" %>
</div>
</div>
<% end %>
<% if @notes.empty? %>
<h4><%= t ".no_notes" %></h4>