Merge remote-tracking branch 'parent/main' into upstream-20241006

2024-10-05 09:10:58 +09:00 · 2024-10-05 09:10:58 +09:00 · 66bed31dbe
commit 66bed31dbe
parent 294acdfd94 c40ab43dc7
226 changed files with 2688 additions and 1846 deletions
--- a/app/helpers/admin/action_logs_helper.rb
+++ b/app/helpers/admin/action_logs_helper.rb
@ -37,4 +37,11 @@ module Admin::ActionLogsHelper
      end
    end
  end
+
+  def sorted_action_log_types
+    Admin::ActionLogFilter::ACTION_TYPE_MAP
+      .keys
+      .map { |key| [I18n.t("admin.action_logs.action_types.#{key}"), key] }
+      .sort_by(&:first)
+  end
 end