Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
7f6359a6
Verified
Commit
7f6359a6
authored
Jan 21, 2019
by
Sébastiaan Versteeg
Browse files
Prevent problems with empty website_id values
parent
74594f43
Changes
1
Hide whitespace changes
Inline
Side-by-side
website/members/management/commands/conscribosync.py
View file @
7f6359a6
...
...
@@ -44,6 +44,7 @@ class Command(BaseCommand):
current_relations
=
{
int
(
r
.
get
(
'website_id'
)):
r
.
get
(
'code'
,
None
)
for
r
in
relations_response
.
get
(
'relations'
).
values
()
if
r
.
get
(
'website_id'
,
''
)
!=
''
}
replace_commands
=
[]
...
...
@@ -54,7 +55,7 @@ class Command(BaseCommand):
fields
=
{
'website_id'
:
member
.
pk
,
'voornaam'
:
member
.
first_name
,
'naam'
:
member
.
last_name
,
'naam'
:
member
.
last_name
[:
100
],
# Conscribo maxlength: 100
'einddatum_lidmaatschap'
:
date
(
member
.
current_membership
.
until
,
'Y-m-d'
),
'e_mailadres'
:
member
.
email
,
...
...
@@ -82,12 +83,11 @@ class Command(BaseCommand):
logger
.
debug
(
response
.
notifications
)
delete_commands
=
[]
for
website_id
,
code
in
current_relations
.
item
s
():
for
code
in
current_relations
.
value
s
():
delete_commands
.
append
(
ApiCommand
(
command
=
'DeleteRelation'
,
entityType
=
'lid'
,
code
=
code
,
website_id
=
website_id
# not used by server
))
delete_responses
=
api
.
multi_request
(
delete_commands
)
...
...
Write
Preview
Supports
Markdown
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