diff --git a/app/controllers/admins_controller.rb b/app/controllers/admins_controller.rb index e8b0a0aa6eba514dd9880f960531e5d848e46a3b..783d9bcd11c50ad925365f293140a72239719776 100644 --- a/app/controllers/admins_controller.rb +++ b/app/controllers/admins_controller.rb @@ -5,7 +5,9 @@ class AdminsController < ApplicationController def user_search params[:user] ||= {} params[:user].delete_if {|key, value| value.blank? } - @users = params[:user].empty? ? [] : User.where(params[:user]) + @users = User.joins(person: :profile).where("profiles.birthday > date_sub(now(), interval 13 year)") if params[:under13] + @users = (@users || User).where(params[:user]) if params[:user].present? + @users ||= [] end def admin_inviter diff --git a/app/views/admins/user_search.html.haml b/app/views/admins/user_search.html.haml index a667cf7bbef3f1938d3b5ba57c047078b3f770e3..c5329f7718d611ec01538f12def2516eb1b5db38 100644 --- a/app/views/admins/user_search.html.haml +++ b/app/views/admins/user_search.html.haml @@ -22,6 +22,9 @@ = t('email') = text_field_tag 'user[email]', params[:user][:email] + = t('.under_13') + = check_box_tag 'under13', params[:under13] + = submit_tag t('admins.stats.go') @@ -38,7 +41,7 @@ = user.person.profile.inspect %br = "invite token: #{invite_code_url(user.invited_by.invite_code)}" if user.invited_by.present? - = link_to "add_invites", add_invites_path(user.invitation_code) + = link_to t(".add_invites"), add_invites_path(user.invitation_code) %br %br %br diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 92984d99553f19b58a80cbc980d7f3ddca1650d2..98ede928cad1f5d036bc2fe4f93aa5ef994b6c78 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -96,6 +96,7 @@ en: you_currently: "you currently have %{user_invitation} invites left %{link}" add_invites: "add invites" email_to: "Email to Invite" + under_13: "Show users that are under 13 (COPPA)" users: zero: "%{count} users found" one: "%{count} user found"