edshot99/eBooru
1
0
Fork 0
forked from e621ng/e621ng
Code Issues 11 Releases 1 Activity

[StaffNotes] Fix staff notes search (#847)

Browse Source 
Fixes #838
This commit is contained in:
clragon 2025-01-22 15:00:30 +01:00 committed by GitHub
parent ddd408ce2c
commit e649523400
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/staff_notes_controller.rb
View File

@ -9,7 +9,7 @@ class StaffNotesController < ApplicationController
def index
@user = User.find_by(id: params[:user_id])
@notes = StaffNote.search(search_params.merge({ user_id: params[:user_id] })).includes(:user, :creator).paginate(params[:page], limit: params[:limit])
@notes = StaffNote.search(search_params).includes(:user, :creator).paginate(params[:page], limit: params[:limit])
respond_with(@notes)
end

2
app/views/mod_actions/_search.html.erb
View File

@ -1,4 +1,4 @@
<%= form_search(path: mod_actions_path) do |f| %>
<%= f.user :creator %>
<%= f.input :action, label: "Action", collection: ModAction::KnownActionKeys.reject { |k| !CurrentUser.is_staff? && ModAction::ProtectedActionKeys.include?(k) }.map { |k| [k.to_s.capitalize.tr("_", " "), k.to_s] }, include_blank: true %>
<%= f.input :action, label: "Action", collection: ModAction::KnownActionKeys.reject { |k| !CurrentUser.is_staff? && ModAction::ProtectedActionKeys.include?(k.to_s) }.map { |k| [k.to_s.capitalize.tr("_", " "), k.to_s] }, include_blank: true %>
<% end %>