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
c805631f
Commit
c805631f
authored
Aug 18, 2022
by
François C.
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '3635-is-associated-people-search' into 'dev_cooperatic'
3635-is-associated-people-search See merge request
!195
parents
ddcbb3a0
0fbac578
Pipeline
#2359
passed with stage
in 1 minute 23 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
models.py
members/models.py
+1
-1
manage_regular_shifts.js
members/static/js/admin/manage_regular_shifts.js
+1
-1
No files found.
members/models.py
View file @
c805631f
...
...
@@ -826,7 +826,7 @@ class CagetteMember(models.Model):
# member = CagetteMember(m['id'], m['email'])
# m['next_shifts'] = member.get_next_shift()
if
not
m
[
'parent_name'
]
is
False
:
m
[
'name'
]
+=
' (
en binôme avec
'
+
m
[
'parent_name'
]
+
')'
m
[
'name'
]
+=
' (
suppléant.e de son binôme
'
+
m
[
'parent_name'
]
+
')'
del
m
[
'parent_name'
]
members
.
append
(
m
)
...
...
members/static/js/admin/manage_regular_shifts.js
View file @
c805631f
...
...
@@ -293,7 +293,7 @@ $(document).ready(function() {
let
search_str
=
$
(
'#search_member_input'
).
val
();
$
.
ajax
({
url
:
`/members/search/
${
search_str
}
?search_type=shift_template_data`
,
url
:
'/members/search/'
+
search_str
,
dataType
:
'json'
,
success
:
function
(
data
)
{
$
(
'#partner_data_area'
).
hide
();
...
...
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