Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
third-party
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cooperatic-foodcoops
third-party
Commits
dca25d09
Commit
dca25d09
authored
Mar 09, 2022
by
Etienne Freiss
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
develop
parent
afe5a5e8
Pipeline
#1891
passed with stage
in 1 minute 26 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
models.py
members/models.py
+5
-2
inscriptions.js
members/static/js/inscriptions.js
+1
-1
No files found.
members/models.py
View file @
dca25d09
...
@@ -775,9 +775,12 @@ class CagetteMember(models.Model):
...
@@ -775,9 +775,12 @@ class CagetteMember(models.Model):
cond
=
[[
'name'
,
'ilike'
,
str
(
key
)]]
cond
=
[[
'name'
,
'ilike'
,
str
(
key
)]]
cond
.
append
(
'|'
)
cond
.
append
(
'|'
)
cond
.
append
([
'is_member'
,
'='
,
True
])
cond
.
append
([
'is_member'
,
'='
,
True
])
cond
.
append
([
'is_associated_people'
,
'='
,
True
])
if
search_type
!=
'members'
:
cond
.
append
([
'is_associated_people'
,
'='
,
True
])
else
:
cond
.
append
([
'is_associated_people'
,
'='
,
False
])
# cond.append(['cooperative_state', '!=', 'unsubscribed'])
# cond.append(['cooperative_state', '!=', 'unsubscribed'])
if
search_type
==
"full"
:
if
search_type
==
"full"
or
search_type
==
'members'
:
fields
=
CagetteMember
.
m_default_fields
fields
=
CagetteMember
.
m_default_fields
if
not
shift_id
is
None
:
if
not
shift_id
is
None
:
CagetteMember
.
m_default_fields
.
append
(
'tmpl_reg_line_ids'
)
CagetteMember
.
m_default_fields
.
append
(
'tmpl_reg_line_ids'
)
...
...
members/static/js/inscriptions.js
View file @
dca25d09
...
@@ -689,7 +689,7 @@ $(document).ready(function() {
...
@@ -689,7 +689,7 @@ $(document).ready(function() {
if
(
search_str
)
{
if
(
search_str
)
{
$
.
ajax
({
$
.
ajax
({
url
:
'/members/search/'
+
search_str
,
url
:
'/members/search/'
+
search_str
+
"?search_type=members"
,
dataType
:
'json'
,
dataType
:
'json'
,
success
:
function
(
data
)
{
success
:
function
(
data
)
{
members_search_results
=
[];
members_search_results
=
[];
...
...
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