Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
re2o
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nounous
re2o
Commits
d9c68e09
Commit
d9c68e09
authored
Mar 18, 2018
by
Gabriel Detraz
Committed by
root
Mar 18, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug affichage club dans la recherche
parent
8ce44ee2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
6 deletions
+13
-6
search/templates/search/index.html
search/templates/search/index.html
+4
-0
search/views.py
search/views.py
+9
-6
No files found.
search/templates/search/index.html
View file @
d9c68e09
...
...
@@ -32,6 +32,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<h2>
Résultats dans les utilisateurs
</h2>
{% include "users/aff_users.html" with users_list=users %}
{% endif%}
{% if clubs %}
<h2>
Résultats dans les clubs
</h2>
{% include "users/aff_clubs.html" with clubs_list=clubs %}
{% endif%}
{% if machines %}
<h2>
Résultats dans les machines :
</h2>
{% include "machines/aff_machines.html" with machines_list=machines %}
...
...
search/views.py
View file @
d9c68e09
...
...
@@ -31,7 +31,7 @@ from django.shortcuts import render
from
django.contrib.auth.decorators
import
login_required
from
django.db.models
import
Q
from
users.models
import
User
,
Ban
,
Whitelist
from
users.models
import
User
,
Adherent
,
Club
,
Ban
,
Whitelist
from
machines.models
import
Machine
from
topologie.models
import
Port
,
Switch
,
Room
from
cotisations.models
import
Facture
...
...
@@ -133,19 +133,20 @@ def search_single_word(word, filters, user,
filter_users
=
(
Q
(
surname__icontains
=
word
)
|
Q
(
adherent__name__icontains
=
word
)
|
Q
(
pseudo__icontains
=
word
)
|
Q
(
club__
room__name__icontains
=
word
room__name__icontains
=
word
)
|
Q
(
adherent__
room__name__icontains
=
word
room__name__icontains
=
word
)
)
&
Q
(
state__in
=
user_state
)
if
not
User
.
can_view_all
(
user
)[
0
]:
filter_users
&=
Q
(
id
=
user
.
id
)
filter_clubs
=
filter_users
filter_users
|=
Q
(
name__icontains
=
word
)
filters
[
'users'
]
|=
filter_users
filters
[
'clubs'
]
|=
filter_clubs
# Machines
if
'1'
in
aff
:
...
...
@@ -359,6 +360,7 @@ def get_results(query, request, params):
filters
=
{
'users'
:
Q
(),
'clubs'
:
Q
(),
'machines'
:
Q
(),
'factures'
:
Q
(),
'bans'
:
Q
(),
...
...
@@ -381,7 +383,8 @@ def get_results(query, request, params):
)
results
=
{
'users'
:
User
.
objects
.
filter
(
filters
[
'users'
]),
'users'
:
Adherent
.
objects
.
filter
(
filters
[
'users'
]),
'clubs'
:
Club
.
objects
.
filter
(
filters
[
'clubs'
]),
'machines'
:
Machine
.
objects
.
filter
(
filters
[
'machines'
]),
'factures'
:
Facture
.
objects
.
filter
(
filters
[
'factures'
]),
'bans'
:
Ban
.
objects
.
filter
(
filters
[
'bans'
]),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment