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
061ab819
Commit
061ab819
authored
Nov 22, 2021
by
François C.
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ticket_1713' into 'evolution_bdm'
sort on date_begin instead of create_date See merge request
!73
parents
2d9174d7
1082f99e
Pipeline
#1514
passed with stage
in 1 minute 33 seconds
Changes
1
Pipelines
2
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
+1
-1
models.py
members_space/models.py
+1
-1
No files found.
members_space/models.py
View file @
061ab819
...
@@ -32,7 +32,7 @@ class CagetteMembersSpace(models.Model):
...
@@ -32,7 +32,7 @@ class CagetteMembersSpace(models.Model):
marshal_none_error
=
'cannot marshal None unless allow_none is enabled'
marshal_none_error
=
'cannot marshal None unless allow_none is enabled'
try
:
try
:
res
=
self
.
o_api
.
search_read
(
'shift.registration'
,
cond
,
f
,
limit
=
limit
,
offset
=
offset
,
res
=
self
.
o_api
.
search_read
(
'shift.registration'
,
cond
,
f
,
limit
=
limit
,
offset
=
offset
,
order
=
'
create_date
DESC'
)
order
=
'
date_begin
DESC'
)
except
Exception
as
e
:
except
Exception
as
e
:
if
not
(
marshal_none_error
in
str
(
e
)):
if
not
(
marshal_none_error
in
str
(
e
)):
res
[
'error'
]
=
repr
(
e
)
res
[
'error'
]
=
repr
(
e
)
...
...
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