Merge branch 'feature/1283-coppa-admin' of https://github.com/diasp/diaspora into diasp-feature/1283-coppa-admin
This commit is contained in:
commit
44fbb6472f
3 changed files with 8 additions and 2 deletions
|
|
@ -5,7 +5,9 @@ class AdminsController < ApplicationController
|
||||||
def user_search
|
def user_search
|
||||||
params[:user] ||= {}
|
params[:user] ||= {}
|
||||||
params[:user].delete_if {|key, value| value.blank? }
|
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
|
end
|
||||||
|
|
||||||
def admin_inviter
|
def admin_inviter
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,9 @@
|
||||||
= t('email')
|
= t('email')
|
||||||
= text_field_tag 'user[email]', params[:user][:email]
|
= text_field_tag 'user[email]', params[:user][:email]
|
||||||
|
|
||||||
|
= t('.under_13')
|
||||||
|
= check_box_tag 'under13', params[:under13]
|
||||||
|
|
||||||
= submit_tag t('admins.stats.go')
|
= submit_tag t('admins.stats.go')
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -38,7 +41,7 @@
|
||||||
= user.person.profile.inspect
|
= user.person.profile.inspect
|
||||||
%br
|
%br
|
||||||
= "invite token: #{invite_code_url(user.invited_by.invite_code)}" if user.invited_by.present?
|
= "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
|
%br
|
||||||
%br
|
%br
|
||||||
|
|
|
||||||
|
|
@ -96,6 +96,7 @@ en:
|
||||||
you_currently: "you currently have %{user_invitation} invites left %{link}"
|
you_currently: "you currently have %{user_invitation} invites left %{link}"
|
||||||
add_invites: "add invites"
|
add_invites: "add invites"
|
||||||
email_to: "Email to Invite"
|
email_to: "Email to Invite"
|
||||||
|
under_13: "Show users that are under 13 (COPPA)"
|
||||||
users:
|
users:
|
||||||
zero: "%{count} users found"
|
zero: "%{count} users found"
|
||||||
one: "%{count} user found"
|
one: "%{count} user found"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue