Skip to content
GitLab
Explorer
Connexion
S'inscrire
Navigation principale
Rechercher ou aller à…
Projet
P
parlote-facil
Gestion
Activité
Membres
Labels
Programmation
Tickets
Tableaux des tickets
Jalons
Wiki
Code
Requêtes de fusion
Dépôt
Branches
Validations
Étiquettes
Graphe du dépôt
Comparer les révisions
Extraits de code
Compilation
Pipelines
Jobs
Planifications de pipeline
Artéfacts
Déploiement
Releases
Registre de paquets
Registre de conteneur
Registre de modèles
Opération
Environnements
Modules Terraform
Surveillance
Incidents
Analyse
Données d'analyse des chaînes de valeur
Analyse des contributeurs
Données d'analyse CI/CD
Données d'analyse du dépôt
Expériences du modèle
Aide
Aide
Support
Documentation de GitLab
Comparer les forfaits GitLab
Forum de la communauté
Contribuer à GitLab
Donner votre avis
Raccourcis clavier
?
Extraits de code
Groupes
Projets
Afficher davantage de fils d'Ariane
facil
parlote-facil
Validations
02be4a53
Valider
02be4a53
rédigé
il y a 11 ans
par
Florian Staudacher
Parcourir les fichiers
Options
Téléchargements
Correctifs
Plain Diff
make age search postgres compatible, add spec, changelog
parent
44fbb647
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Modifications
3
Masquer les modifications d'espaces
En ligne
Côte à côte
Affichage de
3 fichiers modifiés
Changelog.md
+1
-0
1 ajout, 0 suppression
Changelog.md
app/controllers/admins_controller.rb
+5
-5
5 ajouts, 5 suppressions
app/controllers/admins_controller.rb
spec/controllers/admins_controller_spec.rb
+19
-4
19 ajouts, 4 suppressions
spec/controllers/admins_controller_spec.rb
avec
25 ajouts
et
9 suppressions
Changelog.md
+
1
−
0
Voir le fichier @
02be4a53
...
@@ -33,6 +33,7 @@
...
@@ -33,6 +33,7 @@
*
Deleting a post that was shared to Twitter now deletes it from Twitter too
[
#4156
](
https://github.com/diaspora/diaspora/pull/4156
)
*
Deleting a post that was shared to Twitter now deletes it from Twitter too
[
#4156
](
https://github.com/diaspora/diaspora/pull/4156
)
*
Improvement on how participants are displayed on each conversation without opening it
[
#4149
](
https://github.com/diaspora/diaspora/pull/4149
)
*
Improvement on how participants are displayed on each conversation without opening it
[
#4149
](
https://github.com/diaspora/diaspora/pull/4149
)
*
Admin: add option to find users under 13 (COPPA)
[
#4252
](
https://github.com/diaspora/diaspora/pull/4252
)
## Gem updates
## Gem updates
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
app/controllers/admins_controller.rb
+
5
−
5
Voir le fichier @
02be4a53
...
@@ -5,16 +5,16 @@ class AdminsController < ApplicationController
...
@@ -5,16 +5,16 @@ 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
=
User
.
joins
(
person: :profile
).
where
(
"profiles.birthday >
date_sub(now(), interval
13
year
)"
)
if
params
[
:under13
]
@users
=
User
.
joins
(
person: :profile
).
where
(
[
"profiles.birthday >
?"
,
Date
.
today
-
13
.
year
s
]
)
if
params
[
:under13
]
@users
=
(
@users
||
User
).
where
(
params
[
:user
])
if
params
[
:user
].
present?
@users
=
(
@users
||
User
).
where
(
params
[
:user
])
if
params
[
:user
].
present?
@users
||=
[]
@users
||=
[]
end
end
def
admin_inviter
def
admin_inviter
inviter
=
InvitationCode
.
default_inviter_or
(
current_user
)
inviter
=
InvitationCode
.
default_inviter_or
(
current_user
)
email
=
params
[
:identifier
]
email
=
params
[
:identifier
]
user
=
User
.
find_by_email
(
email
)
user
=
User
.
find_by_email
(
email
)
unless
user
unless
user
EmailInviter
.
new
(
email
,
inviter
).
send!
EmailInviter
.
new
(
email
,
inviter
).
send!
flash
[
:notice
]
=
"invitation sent to
#{
email
}
"
flash
[
:notice
]
=
"invitation sent to
#{
email
}
"
...
@@ -32,14 +32,14 @@ class AdminsController < ApplicationController
...
@@ -32,14 +32,14 @@ class AdminsController < ApplicationController
def
weekly_user_stats
def
weekly_user_stats
@created_users
=
User
.
where
(
"username IS NOT NULL and created_at IS NOT NULL"
)
@created_users
=
User
.
where
(
"username IS NOT NULL and created_at IS NOT NULL"
)
@created_users_by_week
=
Hash
.
new
{
|
h
,
k
|
h
[
k
]
=
[]
}
@created_users_by_week
=
Hash
.
new
{
|
h
,
k
|
h
[
k
]
=
[]
}
@created_users
.
find_each
do
|
u
|
@created_users
.
find_each
do
|
u
|
unless
u
.
nil?
unless
u
.
nil?
@created_users_by_week
[
u
.
created_at
.
beginning_of_week
.
strftime
(
"%Y-%m-%d"
)].
push
(
"
#{
u
.
username
}
"
)
@created_users_by_week
[
u
.
created_at
.
beginning_of_week
.
strftime
(
"%Y-%m-%d"
)].
push
(
"
#{
u
.
username
}
"
)
end
end
end
end
unless
(
params
[
:week
]).
nil?
unless
(
params
[
:week
]).
nil?
# @segment = "#{@created_users_by_week[(params[:week])]}"
# @segment = "#{@created_users_by_week[(params[:week])]}"
@counter
=
"
#{
@created_users_by_week
[(
params
[
:week
])].
count
}
"
@counter
=
"
#{
@created_users_by_week
[(
params
[
:week
])].
count
}
"
else
else
@counter
=
""
@counter
=
""
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
spec/controllers/admins_controller_spec.rb
+
19
−
4
Voir le fichier @
02be4a53
...
@@ -34,29 +34,44 @@ describe AdminsController do
...
@@ -34,29 +34,44 @@ describe AdminsController do
assigns
[
:users
].
should
==
[]
assigns
[
:users
].
should
==
[]
end
end
it
'
should
search on username'
do
it
'search
es
on username'
do
get
:user_search
,
:user
=>
{
:username
=>
@user
.
username
}
get
:user_search
,
:user
=>
{
:username
=>
@user
.
username
}
assigns
[
:users
].
should
==
[
@user
]
assigns
[
:users
].
should
==
[
@user
]
end
end
it
'
should
search on email'
do
it
'search
es
on email'
do
get
:user_search
,
:user
=>
{
:email
=>
@user
.
email
}
get
:user_search
,
:user
=>
{
:email
=>
@user
.
email
}
assigns
[
:users
].
should
==
[
@user
]
assigns
[
:users
].
should
==
[
@user
]
end
end
it
'
should
search on invitation_identifier'
do
it
'search
es
on invitation_identifier'
do
@user
.
invitation_identifier
=
"La@foo.com"
@user
.
invitation_identifier
=
"La@foo.com"
@user
.
save!
@user
.
save!
get
:user_search
,
:user
=>
{
:invitation_identifier
=>
@user
.
invitation_identifier
}
get
:user_search
,
:user
=>
{
:invitation_identifier
=>
@user
.
invitation_identifier
}
assigns
[
:users
].
should
==
[
@user
]
assigns
[
:users
].
should
==
[
@user
]
end
end
it
'
should
search on invitation_token'
do
it
'search
es
on invitation_token'
do
@user
.
invitation_token
=
"akjsdhflhasdf"
@user
.
invitation_token
=
"akjsdhflhasdf"
@user
.
save
@user
.
save
get
:user_search
,
:user
=>
{
:invitation_token
=>
@user
.
invitation_token
}
get
:user_search
,
:user
=>
{
:invitation_token
=>
@user
.
invitation_token
}
assigns
[
:users
].
should
==
[
@user
]
assigns
[
:users
].
should
==
[
@user
]
end
end
it
'searches on age < 13 (COPPA)'
do
u_13
=
FactoryGirl
.
create
(
:user
)
u_13
.
profile
.
birthday
=
10
.
years
.
ago
.
to_date
u_13
.
profile
.
save!
o_13
=
FactoryGirl
.
create
(
:user
)
o_13
.
profile
.
birthday
=
20
.
years
.
ago
.
to_date
o_13
.
profile
.
save!
get
:user_search
,
under13:
true
assigns
[
:users
].
should
include
(
u_13
)
assigns
[
:users
].
should_not
include
(
o_13
)
end
end
end
end
end
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
Aperçu
0%
Chargement en cours
Veuillez réessayer
ou
joindre un nouveau fichier
.
Annuler
You are about to add
0
people
to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Enregistrer le commentaire
Annuler
Veuillez vous
inscrire
ou vous
se connecter
pour commenter